wok-tiny rev 114
modules-*: fix post_install
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Fri Apr 01 23:34:24 2016 +0200 (2016-04-01) |
| parents | d6527924eb96 |
| children | 01db63d9f122 |
| files | module-3c509/receipt module-8250/receipt module-cifs/receipt module-cs89x0/receipt module-ext3/receipt module-floppy/receipt module-fuse/receipt module-hfsplus/receipt module-ide/receipt module-isofs/receipt module-loop/receipt module-lp/receipt module-ne/receipt module-nfsd/receipt module-reiserfs/receipt module-serial/receipt module-tlan/receipt module-usb-storage/receipt module-usbkbd/receipt module-usblp/receipt module-usbmouse/receipt module-usbserial/receipt module-vfat/receipt module-xfs/receipt |
line diff
1.1 --- a/module-3c509/receipt Wed Mar 30 13:45:46 2016 +0200 1.2 +++ b/module-3c509/receipt Fri Apr 01 23:34:24 2016 +0200 1.3 @@ -30,6 +30,7 @@ 1.4 { 1.5 [ "$IRQ3C509" ] && IRQ3C509="|irq=${IRQ3C509// /,}" 1.6 [ "$XCVR3C509" ] && XCVR3C509="|xcvr=$XCVR3C509" 1.7 + grep -qs "^${PACKAGE#*-}|" $1/modules || 1.8 echo "${PACKAGE#*-}$IRQ3C509|debug=${DBG3C509:-0}$XCVR3C509|max_interrupt_work=${MAXE3C509:-10}" >> $1/modules 1.9 } 1.10
2.1 --- a/module-8250/receipt Wed Mar 30 13:45:46 2016 +0200 2.2 +++ b/module-8250/receipt Fri Apr 01 23:34:24 2016 +0200 2.3 @@ -28,5 +28,7 @@ 2.4 # Post install/remove commands for Tazpkg. 2.5 post_install() 2.6 { 2.7 - echo ${PACKAGE#*-} >> $1/modules 2.8 + for i in serial_core 8250 ; do 2.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 2.10 + done 2.11 }
3.1 --- a/module-cifs/receipt Wed Mar 30 13:45:46 2016 +0200 3.2 +++ b/module-cifs/receipt Fri Apr 01 23:34:24 2016 +0200 3.3 @@ -30,7 +30,9 @@ 3.4 # Post install/remove commands for Tazpkg. 3.5 post_install() 3.6 { 3.7 - echo ${PACKAGE#*-} >> $1/modules 3.8 + for i in nls_base cifs ; do 3.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 3.10 + done 3.11 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 3.12 echo "${PACKAGE#*-}" >> $1/etc/filesystems 3.13 }
4.1 --- a/module-cs89x0/receipt Wed Mar 30 13:45:46 2016 +0200 4.2 +++ b/module-cs89x0/receipt Fri Apr 01 23:34:24 2016 +0200 4.3 @@ -31,6 +31,7 @@ 4.4 [ "$IRQCS89" ] || return 4.5 IRQCS89="|irq=${IRQCS89%%[, ]*}" 4.6 [ "$IOCS89" ] && IOCS89="|io=${IOCS89%%[, ]*}" 4.7 + grep -qs "^${PACKAGE#*-}|" $1/modules || 4.8 echo "${PACKAGE#*-}$IOCS89$IRQCS89|mode=${MODECS89:-rj45}|debug=${DEBUGCS89:-0}" >> $1/modules 4.9 } 4.10
5.1 --- a/module-ext3/receipt Wed Mar 30 13:45:46 2016 +0200 5.2 +++ b/module-ext3/receipt Fri Apr 01 23:34:24 2016 +0200 5.3 @@ -30,7 +30,9 @@ 5.4 # Post install/remove commands for Tazpkg. 5.5 post_install() 5.6 { 5.7 - echo ${PACKAGE#*-} >> $1/modules 5.8 + for i in jbd ext3 ; do 5.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 5.10 + done 5.11 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 5.12 echo "${PACKAGE#*-}" >> $1/etc/filesystems 5.13 }
6.1 --- a/module-floppy/receipt Wed Mar 30 13:45:46 2016 +0200 6.2 +++ b/module-floppy/receipt Fri Apr 01 23:34:24 2016 +0200 6.3 @@ -29,5 +29,5 @@ 6.4 # Post install/remove commands for Tazpkg. 6.5 post_install() 6.6 { 6.7 - echo ${PACKAGE#*-} >> $1/modules 6.8 + grep -qs ^${PACKAGE#*-}$ $1/modules || echo ${PACKAGE#*-} >> $1/modules 6.9 }
7.1 --- a/module-fuse/receipt Wed Mar 30 13:45:46 2016 +0200 7.2 +++ b/module-fuse/receipt Fri Apr 01 23:34:24 2016 +0200 7.3 @@ -30,7 +30,7 @@ 7.4 # Post install/remove commands for Tazpkg. 7.5 post_install() 7.6 { 7.7 - echo ${PACKAGE#*-} >> $1/modules 7.8 + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules 7.9 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 7.10 echo "${PACKAGE#*-}" >> $1/etc/filesystems 7.11 }
8.1 --- a/module-hfsplus/receipt Wed Mar 30 13:45:46 2016 +0200 8.2 +++ b/module-hfsplus/receipt Fri Apr 01 23:34:24 2016 +0200 8.3 @@ -30,7 +30,9 @@ 8.4 # Post install/remove commands for Tazpkg. 8.5 post_install() 8.6 { 8.7 - echo ${PACKAGE#*-} >> $1/modules 8.8 + for i in nls_base hfsplus ; do 8.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 8.10 + done 8.11 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 8.12 echo "${PACKAGE#*-}" >> $1/etc/filesystems 8.13 }
9.1 --- a/module-ide/receipt Wed Mar 30 13:45:46 2016 +0200 9.2 +++ b/module-ide/receipt Fri Apr 01 23:34:24 2016 +0200 9.3 @@ -29,9 +29,7 @@ 9.4 # Post install/remove commands for Tazpkg. 9.5 post_install() 9.6 { 9.7 - cat >> $1/modules <<EOT 9.8 -ide-core 9.9 -ide-disk 9.10 -ide-generic 9.11 -EOT 9.12 + for i in ide-core ide-disk ide-generic ; do 9.13 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 9.14 + done 9.15 }
10.1 --- a/module-isofs/receipt Wed Mar 30 13:45:46 2016 +0200 10.2 +++ b/module-isofs/receipt Fri Apr 01 23:34:24 2016 +0200 10.3 @@ -30,7 +30,7 @@ 10.4 # Post install/remove commands for Tazpkg. 10.5 post_install() 10.6 { 10.7 - echo ${PACKAGE#*-} >> $1/modules 10.8 + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules 10.9 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 10.10 echo "${PACKAGE#*-}" >> $1/etc/filesystems 10.11 }
11.1 --- a/module-loop/receipt Wed Mar 30 13:45:46 2016 +0200 11.2 +++ b/module-loop/receipt Fri Apr 01 23:34:24 2016 +0200 11.3 @@ -28,5 +28,5 @@ 11.4 # Post install/remove commands for Tazpkg. 11.5 post_install() 11.6 { 11.7 - echo ${PACKAGE#*-} >> $1/modules 11.8 + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules 11.9 }
12.1 --- a/module-lp/receipt Wed Mar 30 13:45:46 2016 +0200 12.2 +++ b/module-lp/receipt Fri Apr 01 23:34:24 2016 +0200 12.3 @@ -28,5 +28,7 @@ 12.4 # Post install/remove commands for Tazpkg. 12.5 post_install() 12.6 { 12.7 - echo ${PACKAGE#*-} >> $1/modules 12.8 + for i in parport lp ; do 12.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 12.10 + done 12.11 }
13.1 --- a/module-ne/receipt Wed Mar 30 13:45:46 2016 +0200 13.2 +++ b/module-ne/receipt Fri Apr 01 23:34:24 2016 +0200 13.3 @@ -31,6 +31,7 @@ 13.4 [ "$IRQNE2K" ] && IRQNE2K="|irq=${IRQNE2K// /,}" 13.5 [ "$IONE2K" ] && IONE2K="|io=${IONE2K// /,}" 13.6 [ "$BADNE2K" == "ON" ] && BADNE2K="|bad" || BADNE2K="" 13.7 + grep -qs "^${PACKAGE#*-}|" $1/modules || 13.8 echo "${PACKAGE#*-}${IONE2K:-|io=0x300}$IRQNE2K$BADNE2K" >> $1/modules 13.9 } 13.10
14.1 --- a/module-nfsd/receipt Wed Mar 30 13:45:46 2016 +0200 14.2 +++ b/module-nfsd/receipt Fri Apr 01 23:34:24 2016 +0200 14.3 @@ -30,7 +30,9 @@ 14.4 # Post install/remove commands for Tazpkg. 14.5 post_install() 14.6 { 14.7 - echo ${PACKAGE#*-} >> $1/modules 14.8 + for i in sunrpc lockd exportfs nfsd ; do 14.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 14.10 + done 14.11 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 14.12 echo "${PACKAGE#*-}" >> $1/etc/filesystems 14.13 }
15.1 --- a/module-reiserfs/receipt Wed Mar 30 13:45:46 2016 +0200 15.2 +++ b/module-reiserfs/receipt Fri Apr 01 23:34:24 2016 +0200 15.3 @@ -30,7 +30,7 @@ 15.4 # Post install/remove commands for Tazpkg. 15.5 post_install() 15.6 { 15.7 - echo ${PACKAGE#*-} >> $1/modules 15.8 + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules 15.9 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 15.10 echo "${PACKAGE#*-}" >> $1/etc/filesystems 15.11 }
16.1 --- a/module-serial/receipt Wed Mar 30 13:45:46 2016 +0200 16.2 +++ b/module-serial/receipt Fri Apr 01 23:34:24 2016 +0200 16.3 @@ -31,5 +31,7 @@ 16.4 # Post install/remove commands for Tazpkg. 16.5 post_install() 16.6 { 16.7 - echo 8250_pci >> $1/modules 16.8 + for i in serial_core 8250 8250_pci ; do 16.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 16.10 + done 16.11 }
17.1 --- a/module-tlan/receipt Wed Mar 30 13:45:46 2016 +0200 17.2 +++ b/module-tlan/receipt Fri Apr 01 23:34:24 2016 +0200 17.3 @@ -28,6 +28,7 @@ 17.4 # Post install/remove commands for Tazpkg. 17.5 post_install() 17.6 { 17.7 + grep -qs "^${PACKAGE#*-}|" $1/modules || 17.8 echo "${PACKAGE#*-}|aui=${AUITLAN:-0}|bbuf=${BIGBUFTLAN:-0}|speed=${SPEEDTLAN:-0}|duplex=${DUPLEXTLAN:-0}" >> $1/modules 17.9 } 17.10
18.1 --- a/module-usb-storage/receipt Wed Mar 30 13:45:46 2016 +0200 18.2 +++ b/module-usb-storage/receipt Fri Apr 01 23:34:24 2016 +0200 18.3 @@ -29,7 +29,9 @@ 18.4 # Post install/remove commands for Tazpkg. 18.5 post_install() 18.6 { 18.7 - echo ${PACKAGE#*-} >> $1/modules 18.8 + for i in scsi_mod usbcore usb-storage ; do 18.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 18.10 + done 18.11 } 18.12 18.13 #scsi_mod.ko:
19.1 --- a/module-usbkbd/receipt Wed Mar 30 13:45:46 2016 +0200 19.2 +++ b/module-usbkbd/receipt Fri Apr 01 23:34:24 2016 +0200 19.3 @@ -28,5 +28,7 @@ 19.4 # Post install/remove commands for Tazpkg. 19.5 post_install() 19.6 { 19.7 - echo ${PACKAGE#*-} >> $1/modules 19.8 + for i in usbcore usbkbd ; do 19.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 19.10 + done 19.11 }
20.1 --- a/module-usblp/receipt Wed Mar 30 13:45:46 2016 +0200 20.2 +++ b/module-usblp/receipt Fri Apr 01 23:34:24 2016 +0200 20.3 @@ -29,5 +29,7 @@ 20.4 # Post install/remove commands for Tazpkg. 20.5 post_install() 20.6 { 20.7 - echo ${PACKAGE#*-} >> $1/modules 20.8 + for i in usbcore usblp ; do 20.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 20.10 + done 20.11 }
21.1 --- a/module-usbmouse/receipt Wed Mar 30 13:45:46 2016 +0200 21.2 +++ b/module-usbmouse/receipt Fri Apr 01 23:34:24 2016 +0200 21.3 @@ -29,5 +29,7 @@ 21.4 # Post install/remove commands for Tazpkg. 21.5 post_install() 21.6 { 21.7 - echo ${PACKAGE#*-} >> $1/modules 21.8 + for i in usbcore usbmouse ; do 21.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 21.10 + done 21.11 }
22.1 --- a/module-usbserial/receipt Wed Mar 30 13:45:46 2016 +0200 22.2 +++ b/module-usbserial/receipt Fri Apr 01 23:34:24 2016 +0200 22.3 @@ -32,5 +32,7 @@ 22.4 # Post install/remove commands for Tazpkg. 22.5 post_install() 22.6 { 22.7 - echo ${PACKAGE#*-} >> $1/modules 22.8 + for i in usbcore usbserial ; do 22.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 22.10 + done 22.11 }
23.1 --- a/module-vfat/receipt Wed Mar 30 13:45:46 2016 +0200 23.2 +++ b/module-vfat/receipt Fri Apr 01 23:34:24 2016 +0200 23.3 @@ -30,7 +30,9 @@ 23.4 # Post install/remove commands for Tazpkg. 23.5 post_install() 23.6 { 23.7 - echo ${PACKAGE#*-} >> $1/modules 23.8 + for i in nls_base fat vfat ; do 23.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 23.10 + done 23.11 for i in vfat fat msdos ; do 23.12 grep -qs ^$i$ $1/etc/filesystems || \ 23.13 echo "$i" >> $1/etc/filesystems
24.1 --- a/module-xfs/receipt Wed Mar 30 13:45:46 2016 +0200 24.2 +++ b/module-xfs/receipt Fri Apr 01 23:34:24 2016 +0200 24.3 @@ -30,7 +30,9 @@ 24.4 # Post install/remove commands for Tazpkg. 24.5 post_install() 24.6 { 24.7 - echo ${PACKAGE#*-} >> $1/modules 24.8 + for i in exportfs xfs ; do 24.9 + grep -qs ^$i$ $1/modules || echo $i >> $1/modules 24.10 + done 24.11 grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ 24.12 echo "${PACKAGE#*-}" >> $1/etc/filesystems 24.13 }