# HG changeset patch # User Pascal Bellard # Date 1459546464 -7200 # Node ID 8af7d8943f03b4537b65837f938bcb453d1929f6 # Parent d6527924eb9689c81f5abb4924f19de5ecc68ef8 modules-*: fix post_install diff -r d6527924eb96 -r 8af7d8943f03 module-3c509/receipt --- a/module-3c509/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-3c509/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,6 +30,7 @@ { [ "$IRQ3C509" ] && IRQ3C509="|irq=${IRQ3C509// /,}" [ "$XCVR3C509" ] && XCVR3C509="|xcvr=$XCVR3C509" + grep -qs "^${PACKAGE#*-}|" $1/modules || echo "${PACKAGE#*-}$IRQ3C509|debug=${DBG3C509:-0}$XCVR3C509|max_interrupt_work=${MAXE3C509:-10}" >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-8250/receipt --- a/module-8250/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-8250/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -28,5 +28,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in serial_core 8250 ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-cifs/receipt --- a/module-cifs/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-cifs/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in nls_base cifs ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-cs89x0/receipt --- a/module-cs89x0/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-cs89x0/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -31,6 +31,7 @@ [ "$IRQCS89" ] || return IRQCS89="|irq=${IRQCS89%%[, ]*}" [ "$IOCS89" ] && IOCS89="|io=${IOCS89%%[, ]*}" + grep -qs "^${PACKAGE#*-}|" $1/modules || echo "${PACKAGE#*-}$IOCS89$IRQCS89|mode=${MODECS89:-rj45}|debug=${DEBUGCS89:-0}" >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-ext3/receipt --- a/module-ext3/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-ext3/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in jbd ext3 ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-floppy/receipt --- a/module-floppy/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-floppy/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -29,5 +29,5 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + grep -qs ^${PACKAGE#*-}$ $1/modules || echo ${PACKAGE#*-} >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-fuse/receipt --- a/module-fuse/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-fuse/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-hfsplus/receipt --- a/module-hfsplus/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-hfsplus/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in nls_base hfsplus ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-ide/receipt --- a/module-ide/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-ide/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -29,9 +29,7 @@ # Post install/remove commands for Tazpkg. post_install() { - cat >> $1/modules <> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-isofs/receipt --- a/module-isofs/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-isofs/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-loop/receipt --- a/module-loop/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-loop/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -28,5 +28,5 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-lp/receipt --- a/module-lp/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-lp/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -28,5 +28,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in parport lp ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-ne/receipt --- a/module-ne/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-ne/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -31,6 +31,7 @@ [ "$IRQNE2K" ] && IRQNE2K="|irq=${IRQNE2K// /,}" [ "$IONE2K" ] && IONE2K="|io=${IONE2K// /,}" [ "$BADNE2K" == "ON" ] && BADNE2K="|bad" || BADNE2K="" + grep -qs "^${PACKAGE#*-}|" $1/modules || echo "${PACKAGE#*-}${IONE2K:-|io=0x300}$IRQNE2K$BADNE2K" >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-nfsd/receipt --- a/module-nfsd/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-nfsd/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in sunrpc lockd exportfs nfsd ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-reiserfs/receipt --- a/module-reiserfs/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-reiserfs/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + grep -qs ${PACKAGE#*-} $1/modules || echo ${PACKAGE#*-} >> $1/modules grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems } diff -r d6527924eb96 -r 8af7d8943f03 module-serial/receipt --- a/module-serial/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-serial/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -31,5 +31,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo 8250_pci >> $1/modules + for i in serial_core 8250 8250_pci ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-tlan/receipt --- a/module-tlan/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-tlan/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -28,6 +28,7 @@ # Post install/remove commands for Tazpkg. post_install() { + grep -qs "^${PACKAGE#*-}|" $1/modules || echo "${PACKAGE#*-}|aui=${AUITLAN:-0}|bbuf=${BIGBUFTLAN:-0}|speed=${SPEEDTLAN:-0}|duplex=${DUPLEXTLAN:-0}" >> $1/modules } diff -r d6527924eb96 -r 8af7d8943f03 module-usb-storage/receipt --- a/module-usb-storage/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-usb-storage/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -29,7 +29,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in scsi_mod usbcore usb-storage ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } #scsi_mod.ko: diff -r d6527924eb96 -r 8af7d8943f03 module-usbkbd/receipt --- a/module-usbkbd/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-usbkbd/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -28,5 +28,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in usbcore usbkbd ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-usblp/receipt --- a/module-usblp/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-usblp/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -29,5 +29,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in usbcore usblp ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-usbmouse/receipt --- a/module-usbmouse/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-usbmouse/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -29,5 +29,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in usbcore usbmouse ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-usbserial/receipt --- a/module-usbserial/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-usbserial/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -32,5 +32,7 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in usbcore usbserial ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done } diff -r d6527924eb96 -r 8af7d8943f03 module-vfat/receipt --- a/module-vfat/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-vfat/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in nls_base fat vfat ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done for i in vfat fat msdos ; do grep -qs ^$i$ $1/etc/filesystems || \ echo "$i" >> $1/etc/filesystems diff -r d6527924eb96 -r 8af7d8943f03 module-xfs/receipt --- a/module-xfs/receipt Wed Mar 30 13:45:46 2016 +0200 +++ b/module-xfs/receipt Fri Apr 01 23:34:24 2016 +0200 @@ -30,7 +30,9 @@ # Post install/remove commands for Tazpkg. post_install() { - echo ${PACKAGE#*-} >> $1/modules + for i in exportfs xfs ; do + grep -qs ^$i$ $1/modules || echo $i >> $1/modules + done grep -qs ^${PACKAGE#*-}$ $1/etc/filesystems || \ echo "${PACKAGE#*-}" >> $1/etc/filesystems }