# HG changeset patch # User Pascal Bellard # Date 1567270712 -7200 # Node ID df0a7ccded6cf4deee1b426c338c9a2d1333c35f # Parent 3de5e6325aab58b93455e3f64be3260e6fa44ef7 Add some SCSI modules diff -r 3de5e6325aab -r df0a7ccded6c base-tiny/stuff/etc/init.d/rcS --- a/base-tiny/stuff/etc/init.d/rcS Wed Feb 27 17:43:23 2019 +0100 +++ b/base-tiny/stuff/etc/init.d/rcS Sat Aug 31 18:58:32 2019 +0200 @@ -27,15 +27,16 @@ fi # Load all modules listed in config file. -if [ "$LOAD_MODULES" -o -s /modules ]; then +if [ "$LOAD_MODULES" ]; then echo -n "Loading modules..." - for mod in $LOAD_MODULES $(cat /modules 2> /dev/null) + depmod + for mod in $LOAD_MODULES do echo -n " ${mod%%|*}" modprobe ${mod//|/ } done status - [ "$KEEP_MODULES" ] || rm -rf /lib/modules /modules 2> /dev/null + [ "$KEEP_MODULES" ] || rm -rf /lib/modules 2> /dev/null fi # Mount /sys. diff -r 3de5e6325aab -r df0a7ccded6c busybox/stuff/busybox-git.config --- a/busybox/stuff/busybox-git.config Wed Feb 27 17:43:23 2019 +0100 +++ b/busybox/stuff/busybox-git.config Sat Aug 31 18:58:32 2019 +0200 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Busybox version: 1.28.0.git -# Tue Aug 22 12:23:10 2017 +# Sat Aug 31 16:36:15 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -536,20 +536,20 @@ # Linux Module Utilities # CONFIG_MODPROBE_SMALL=y -# CONFIG_DEPMOD is not set +CONFIG_DEPMOD=y # CONFIG_INSMOD is not set # CONFIG_LSMOD is not set # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set # CONFIG_MODINFO is not set -# CONFIG_MODPROBE is not set +CONFIG_MODPROBE=y # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set # CONFIG_RMMOD is not set # # Options common to multiple modutils # -# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set +CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y +CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED=y # CONFIG_FEATURE_2_4_MODULES is not set # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set @@ -560,8 +560,8 @@ # CONFIG_FEATURE_INSMOD_TRY_MMAP is not set # CONFIG_FEATURE_MODUTILS_ALIAS is not set # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" +CONFIG_DEFAULT_MODULES_DIR="/lib/modules" +CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" # # Linux System Utilities diff -r 3de5e6325aab -r df0a7ccded6c linux/receipt --- a/linux/receipt Wed Feb 27 17:43:23 2019 +0100 +++ b/linux/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -16,7 +16,8 @@ DEPENDS="" BUILD_DEPENDS="slitaz-toolchain perl git lzma wget gcc2" -BUILD_SUGGESTED="advancecomp zopfli lz4 grep" +BUILD_SUGGESTED="advancecomp zopfli" +INSTALL_DEPENDS="lz4 grep" case "$TARGET" in i486) SUGGESTED="memtest ipxe";; # bundle may install a boot menu @@ -92,9 +93,8 @@ post_install() { echo "Processing post-install commands..." - chroot "$1/" /boot/depmod -a $VERSION-slitaz [ -s $1/boot/cmdline ] && cat $1/boot/cmdline | sed 's/^ *//' | \ - dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072 2> /dev/null + dd of=$1/boot/bzImage conv=notrunc bs=1 seek=768 count=3072 $1/boot/pack $1/boot/bzImage # GRUB stuff. diff -r 3de5e6325aab -r df0a7ccded6c linux/stuff/linux-2.6.14-slitaz.config --- a/linux/stuff/linux-2.6.14-slitaz.config Wed Feb 27 17:43:23 2019 +0100 +++ b/linux/stuff/linux-2.6.14-slitaz.config Sat Aug 31 18:58:32 2019 +0200 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.14-tiny1 -# Mon Dec 26 10:16:03 2016 +# Fri Aug 30 18:42:29 2019 # CONFIG_X86=y CONFIG_SEMAPHORE_SLEEPERS=y @@ -216,7 +216,11 @@ # CONFIG_PCI_LEGACY_PROC is not set CONFIG_ISA_DMA_API=y CONFIG_ISA=y -# CONFIG_EISA is not set +CONFIG_EISA=y +CONFIG_EISA_VLB_PRIMING=y +CONFIG_EISA_PCI_EISA=y +CONFIG_EISA_VIRTUAL_ROOT=y +# CONFIG_EISA_NAMES is not set # CONFIG_MCA is not set # CONFIG_SCx200 is not set @@ -425,11 +429,12 @@ # # SCSI support type (disk, tape, CD-ROM) # -# CONFIG_BLK_DEV_SD is not set +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set # CONFIG_CHR_DEV_OSST is not set -# CONFIG_BLK_DEV_SR is not set -# CONFIG_CHR_DEV_SG is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set # @@ -454,8 +459,9 @@ # CONFIG_SCSI_3W_9XXX is not set # CONFIG_SCSI_7000FASST is not set # CONFIG_SCSI_ACARD is not set -# CONFIG_SCSI_AHA152X is not set -# CONFIG_SCSI_AHA1542 is not set +CONFIG_SCSI_AHA152X=m +CONFIG_SCSI_AHA1542=m +CONFIG_SCSI_AHA1740=m # CONFIG_SCSI_AACRAID is not set # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set @@ -497,6 +503,7 @@ # CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_QLA24XX is not set # CONFIG_SCSI_LPFC is not set +# CONFIG_SCSI_SIM710 is not set # CONFIG_SCSI_SYM53C416 is not set # CONFIG_SCSI_DC395x is not set # CONFIG_SCSI_DC390T is not set @@ -597,7 +604,7 @@ # CONFIG_EEXPRESS is not set # CONFIG_EEXPRESS_PRO is not set # CONFIG_HPLAN_PLUS is not set -# CONFIG_HPLAN is not set +CONFIG_HPLAN=m # CONFIG_LP486E is not set # CONFIG_ETH16I is not set CONFIG_NE2000=m @@ -615,9 +622,12 @@ # CONFIG_DGRS is not set # CONFIG_EEPRO100 is not set # CONFIG_E100 is not set +# CONFIG_LNE390 is not set # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set CONFIG_NE2K_PCI=m +# CONFIG_NE3210 is not set +# CONFIG_ES3210 is not set CONFIG_8139CP=m CONFIG_8139TOO=m CONFIG_8139TOO_PIO=y diff -r 3de5e6325aab -r df0a7ccded6c module-aha152x/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-aha152x/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,117 @@ +# SliTaz package receipt. + +PACKAGE="module-aha152x" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the Adaptec AHA152X/2825 SCSI driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} + +onoff() { [ "$1" ] && echo 1 || echo 0; } + +# Post install/remove commands for Tazpkg. +post_install() +{ + if !grep -qs "^${PACKAGE#*-}|" $1/modules; then + echo -n "${PACKAGE#*-}|io=$AHA152X_IOPORT|irq=$AHA152X_IRQ" >> $1/modules + echo -n "|scsiid=$AHA152X_SCSI_ID" >> $1/modules + echo -n "|reconnect=$(onoff $AHA152X_RECONNECT)" >> $1/modules + echo -n "|parity=$(onoff $AHA152X_RECONNECT)" >> $1/modules + echo -n "|sync=$(onoff $AHA152X_SYNC)" >> $1/modules + echo -n "|exttrans=$(onoff $AHA152X_EXT_TRANS)" >> $1/modules + echo "|delay=$AHA152X_DELAY" >> $1/modules + fi +} + +config_form() +{ + if [ -z "$AHA152X_IOPORT" ]; then + AHA152X_IOPORT=0x340 + AHA152X_IRQ=11 + AHA152X_SCSI_ID=7 + AHA152X_RECONNECT=on + AHA152X_PARITY=on + AHA152X_SYNCHRONOUS=on + AHA152X_DELAY=100 + AHA152X_EXT_TRANS= + fi + cat <Adaptec AHA152X/2825 SCSI driver + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Base io address
Interrupt level
SCSI id of controller
+allow targets to disconnect from the bus
+enable parity checking
+enable synchronous transfers
+enable extended translation
Bus reset delay
+EOT +} diff -r 3de5e6325aab -r df0a7ccded6c module-aha1542/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-aha1542/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,104 @@ +# SliTaz package receipt. + +PACKAGE="module-aha1542" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the Adaptec AHA1542 SCSI driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} + +# Post install/remove commands for Tazpkg. +post_install() +{ + if !grep -qs "^${PACKAGE#*-}|" $1/modules; then + echo -n "${PACKAGE#*-}|aha1542=$AHA1542_IOPORT,$AHA1542_BUSON," >> $1/modules + echo -n "$AHA1542_BUSOFF,AHA1542_DMASPEED|" >> $1/modules + echo "|ispnp=$([ "$AHA1542_ISPNP"] && echo 1 || echo 0)" >> $1/modules + fi +} + +config_form() +{ + if [ -z "$AHA1542_IOPORT" ]; then + AHA1542_IOPORT=0x330 + AHA1542_BUSON=11 + AHA1542_BUSOFF=4 + AHA1542_DMASPEED=5 + AHA1542_ISPNP= + fi + cat <Adaptec AHA1542 SCSI driver + + + + + + + + + + + + + + + + + + + + +
Base io address
Data transfer duration time on the AT-bus
Data transfer duration time off the AT-bus
DMA speed
+ISA PnP support
+EOT +} diff -r 3de5e6325aab -r df0a7ccded6c module-aha1740/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-aha1740/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,26 @@ +# SliTaz package receipt. + +PACKAGE="module-aha1740" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the Adaptec 174x SCSI driver (EISA)" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} diff -r 3de5e6325aab -r df0a7ccded6c module-hp/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-hp/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,63 @@ +# SliTaz package receipt. + +PACKAGE="module-hp" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,ethernet" +SHORT_DESC="Kernel module for the HP PC-LAN ISA ethernet driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/net/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} + +# Post install/remove commands for Tazpkg. +post_install() +{ + [ "$IRQHPLAN" ] && IRQHPLAN="|irq=${IRQHPLAN// /,}" + [ "$IOHPLAN" ] && IOHPLAN="|io=${IOHPLAN// /,}" + grep -qs "^${PACKAGE#*-}|" $1/modules || + echo "${PACKAGE#*-}${IOHPLAN:-|io=0x300}$IRQHPLAN" >> $1/modules +} + +config_form() +{ + if [ -n "$IOHPLAN" ]; then + IOHPLAN=0x300 + fi + cat <HP PC-LAN isa Ethernet driver + + + + + + + + + +
Base io address
IRQ (optionnal)
+EOT +} diff -r 3de5e6325aab -r df0a7ccded6c module-imm/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-imm/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="module-imm" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the Iomega VPI2 SCSI/parallel driver (new 100M+ floppy)" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" +DEPENDS="module-sd-mod" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} diff -r 3de5e6325aab -r df0a7ccded6c module-ppa/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-ppa/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,27 @@ +# SliTaz package receipt. + +PACKAGE="module-ppa" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the Iomega VPI0 SCSI/parallel driver (old 100M floppy)" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" +DEPENDS="module-sd-mod" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} diff -r 3de5e6325aab -r df0a7ccded6c module-sd_mod/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-sd_mod/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,26 @@ +# SliTaz package receipt. + +PACKAGE="module-sd_mod" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the SCSI disk (sd) driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} diff -r 3de5e6325aab -r df0a7ccded6c module-sg/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-sg/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,55 @@ +# SliTaz package receipt. + +PACKED_SIZE="60.0K" +UNPACKED_SIZE="176.0K" +PACKAGE="module-sg" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the SCSI generic (sg) driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} + +# Post install/remove commands for Tazpkg. +post_install() +{ + if !grep -qs "^${PACKAGE#*-}|" $1/modules; then + echo -n "${PACKAGE#*-}|allow_dio=" >> $1/modules + echo -n "$([ "$SG_ALLOW_DIO" ] && echo 1 || echo 0)|" >> $1/modules + echo "def_reserved_size=${SG_DEFRESSZ:--1}" >> $1/modules + fi +} + +config_form() +{ + cat <SCSI generic driver + + + + + + + + +
Size of buffer reserved for each fd
allow direct I/O +
+EOT +} diff -r 3de5e6325aab -r df0a7ccded6c module-sr_mod/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/module-sr_mod/receipt Sat Aug 31 18:58:32 2019 +0200 @@ -0,0 +1,45 @@ +# SliTaz package receipt. + +PACKAGE="module-sr_mod" +VERSION="2.6.14" +CATEGORY="base-system" +GROUP="driver,scsi" +SHORT_DESC="Kernel module for the SCSI CD-ROM (sr) driver" +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL" +WEB_SITE="http://tiny.slitaz.org/" +WANTED="linux" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + local path + export src=$WOK/$WANTED/source/linux-$VERSION + export _pkg=$WOK/$WANTED/install + path=lib/modules/$(ls $_pkg/lib/modules)/kernel + mkdir -p $fs/$path + $src/slitaz/list_modules.sh drivers/scsi/${PACKAGE#*-}* | while read module; do + dir=$path/$(dirname $module) + [ -d $fs/$dir ] || mkdir -p $fs/$dir + cp -a $_pkg/$path/$module $fs/$dir + done +} + +# Post install/remove commands for Tazpkg. +post_install() +{ + grep -qs "^${PACKAGE#*-}|" $1/modules || + echo "${PACKAGE#*-}|test_xa=$([ "TEST_XA" ] && echo 1 || echo 0)" >> $1/modules +} + +config_form() +{ + cat <SCSI CD-ROM driver + + + +
Test XA (mode2 sectors) +
+EOT +}