wok-tiny rev 112

misc updates
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 30 09:53:55 2016 +0200 (2016-03-30)
parents 32e0cfa9bcc9
children d6527924eb96
files base-tiny/stuff/etc/init.d/rcS busybox/stuff/busybox-1.18.config dropbear-without-zlib/receipt dropbear/receipt ftp-config/receipt linux/stuff/linux-2.6.14-slitaz.config module-usb-storage/receipt module-usblp/receipt module-usbmouse/receipt module-usbserial/receipt
line diff
     1.1 --- a/base-tiny/stuff/etc/init.d/rcS	Wed Mar 30 01:57:51 2016 +0300
     1.2 +++ b/base-tiny/stuff/etc/init.d/rcS	Wed Mar 30 09:53:55 2016 +0200
     1.3 @@ -48,6 +48,13 @@
     1.4  mount sysfs
     1.5  status
     1.6  
     1.7 +if [ -e /sbin/mdev ]; then
     1.8 +	echo -n "Start hotplug..."
     1.9 +	echo /sbin/mdev > /proc/sys/kernel/hotplug
    1.10 +	mdev -s
    1.11 +	status
    1.12 +fi
    1.13 +
    1.14  echo -n "Updating /dev..."
    1.15  for i in /sys/block/*/dev /sys/block/*/*/dev ; do
    1.16  	[ -s "$i" ] || continue
     2.1 --- a/busybox/stuff/busybox-1.18.config	Wed Mar 30 01:57:51 2016 +0300
     2.2 +++ b/busybox/stuff/busybox-1.18.config	Wed Mar 30 09:53:55 2016 +0200
     2.3 @@ -549,12 +549,12 @@
     2.4  CONFIG_LOSETUP=y
     2.5  CONFIG_LSPCI=y
     2.6  CONFIG_LSUSB=y
     2.7 -# CONFIG_MDEV is not set
     2.8 +CONFIG_MDEV=y
     2.9  # CONFIG_FEATURE_MDEV_CONF is not set
    2.10  # CONFIG_FEATURE_MDEV_RENAME is not set
    2.11  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
    2.12  # CONFIG_FEATURE_MDEV_EXEC is not set
    2.13 -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
    2.14 +CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
    2.15  CONFIG_MKSWAP=y
    2.16  # CONFIG_FEATURE_MKSWAP_UUID is not set
    2.17  CONFIG_MORE=y
     3.1 --- a/dropbear-without-zlib/receipt	Wed Mar 30 01:57:51 2016 +0300
     3.2 +++ b/dropbear-without-zlib/receipt	Wed Mar 30 09:53:55 2016 +0200
     3.3 @@ -35,16 +35,16 @@
     3.4  	chgrp 0 $DESTDIR/usr/sbin/dropbear &&
     3.5  	install -d -m 755 $DESTDIR/usr/bin &&
     3.6  	for i in $DROPBEARS ssh; do
     3.7 -		ln -s ../sbin/dropbear $DESTDIR/usr/bin/$i
     3.8 +		ln  $DESTDIR/usr/sbin/dropbear $DESTDIR/usr/bin/$i
     3.9  	done
    3.10  }
    3.11  
    3.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.13  genpkg_rules()
    3.14  {
    3.15 -	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/dropbear
    3.16 +	mkdir -p $fs/usr/sbin $fs/etc/init.d $fs/etc/dropbear
    3.17  	cp -a $install/usr/bin $fs/usr
    3.18 -	cp -a $install/usr/sbin $fs/usr
    3.19 +	ln $fs/usr/bin/dbclient $fs/usr/sbin/dropbear
    3.20  	ln -s daemon $fs/etc/init.d/dropbear
    3.21  	cat > $fs/etc/dropbear/banner <<EOT
    3.22  
     4.1 --- a/dropbear/receipt	Wed Mar 30 01:57:51 2016 +0300
     4.2 +++ b/dropbear/receipt	Wed Mar 30 09:53:55 2016 +0200
     4.3 @@ -44,9 +44,9 @@
     4.4  # Rules to gen a SliTaz package suitable for Tazpkg.
     4.5  genpkg_rules()
     4.6  {
     4.7 -	mkdir -p $fs/usr $fs/etc/init.d $fs/etc/dropbear
     4.8 +	mkdir -p $fs/usr/sbin $fs/etc/init.d $fs/etc/dropbear
     4.9  	cp -a $install/usr/bin $fs/usr
    4.10 -	cp -a $install/usr/sbin $fs/usr
    4.11 +	ln $fs/usr/bin/dbclient $fs/usr/sbin/dropbear
    4.12  	ln -s daemon $fs/etc/init.d/dropbear
    4.13  	cat > $fs/etc/dropbear/banner <<EOT
    4.14  
     5.1 --- a/ftp-config/receipt	Wed Mar 30 01:57:51 2016 +0300
     5.2 +++ b/ftp-config/receipt	Wed Mar 30 09:53:55 2016 +0200
     5.3 @@ -29,7 +29,8 @@
     5.4  	[ -n "$UPLOAD" ] && ROOT="-w $ROOT"
     5.5  	grep -q inetd $1/etc/rcS.conf ||
     5.6  	sed -i 's/^RUN_DAEMONS="/&inetd /' $1/etc/rcS.conf
     5.7 -	grep -q /ftpd $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
     5.8 +	sed -i '/^#ftp/d' $1/etc/inetd.conf
     5.9 +	grep -q ^ftp $1/etc/inetd.conf || cat >> $1/etc/inetd.conf <<EOT
    5.10  ftp	stream	tcp	nowait	root	ftpd ftpd $ROOT
    5.11  EOT
    5.12  }
     6.1 --- a/linux/stuff/linux-2.6.14-slitaz.config	Wed Mar 30 01:57:51 2016 +0300
     6.2 +++ b/linux/stuff/linux-2.6.14-slitaz.config	Wed Mar 30 09:53:55 2016 +0200
     6.3 @@ -37,7 +37,7 @@
     6.4  CONFIG_INITRAMFS_ROOT_GID=0
     6.5  CONFIG_EMBEDDED=y
     6.6  # CONFIG_KALLSYMS is not set
     6.7 -# CONFIG_PRINTK is not set
     6.8 +CONFIG_PRINTK=y 
     6.9  # CONFIG_BUG is not set
    6.10  # CONFIG_KMALLOC_ACCOUNTING is not set
    6.11  # CONFIG_AUDIT_BOOTMEM is not set
    6.12 @@ -1174,7 +1174,7 @@
    6.13  CONFIG_MSDOS_FS=m
    6.14  CONFIG_VFAT_FS=m
    6.15  CONFIG_FAT_DEFAULT_CODEPAGE=437
    6.16 -CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
    6.17 +CONFIG_FAT_DEFAULT_IOCHARSET="utf8"
    6.18  # CONFIG_NTFS_FS is not set
    6.19  
    6.20  #
    6.21 @@ -1253,8 +1253,8 @@
    6.22  # Native Language Support
    6.23  #
    6.24  CONFIG_NLS=m
    6.25 -CONFIG_NLS_DEFAULT="iso8859-1"
    6.26 -# CONFIG_NLS_CODEPAGE_437 is not set
    6.27 +CONFIG_NLS_DEFAULT="utf8"
    6.28 +CONFIG_NLS_CODEPAGE_437=y
    6.29  # CONFIG_NLS_CODEPAGE_737 is not set
    6.30  # CONFIG_NLS_CODEPAGE_775 is not set
    6.31  # CONFIG_NLS_CODEPAGE_850 is not set
     7.1 --- a/module-usb-storage/receipt	Wed Mar 30 01:57:51 2016 +0300
     7.2 +++ b/module-usb-storage/receipt	Wed Mar 30 09:53:55 2016 +0200
     7.3 @@ -17,7 +17,8 @@
     7.4  	export src=$WOK/$WANTED/source/linux-$VERSION
     7.5  	export _pkg=$WOK/$WANTED/install
     7.6  	path=lib/modules/$(ls $_pkg/lib/modules)/kernel
     7.7 -	mkdir -p $fs/$path
     7.8 +	mkdir -p $fs/$path $fs/sbin
     7.9 +	ln -s /bin/busybox $fs/sbin/mdev
    7.10  	$src/slitaz/list_modules.sh drivers/usb/storage/usb-storage.ko | while read module; do
    7.11  		dir=$path/$(dirname $module)
    7.12  		[ -d $fs/$dir ] || mkdir -p $fs/$dir
     8.1 --- a/module-usblp/receipt	Wed Mar 30 01:57:51 2016 +0300
     8.2 +++ b/module-usblp/receipt	Wed Mar 30 09:53:55 2016 +0200
     8.3 @@ -17,7 +17,8 @@
     8.4  	export src=$WOK/$WANTED/source/linux-$VERSION
     8.5  	export _pkg=$WOK/$WANTED/install
     8.6  	path=lib/modules/$(ls $_pkg/lib/modules)/kernel
     8.7 -	mkdir -p $fs/$path
     8.8 +	mkdir -p $fs/$path $fs/sbin
     8.9 +	ln -s /bin/busybox $fs/sbin/mdev
    8.10  	$src/slitaz/list_modules.sh drivers/usb/class/usblp.ko | while read module; do
    8.11  		dir=$path/$(dirname $module)
    8.12  		[ -d $fs/$dir ] || mkdir -p $fs/$dir
     9.1 --- a/module-usbmouse/receipt	Wed Mar 30 01:57:51 2016 +0300
     9.2 +++ b/module-usbmouse/receipt	Wed Mar 30 09:53:55 2016 +0200
     9.3 @@ -17,7 +17,8 @@
     9.4  	export src=$WOK/$WANTED/source/linux-$VERSION
     9.5  	export _pkg=$WOK/$WANTED/install
     9.6  	path=lib/modules/$(ls $_pkg/lib/modules)/kernel
     9.7 -	mkdir -p $fs/$path
     9.8 +	mkdir -p $fs/$path $fs/sbin
     9.9 +	ln -s /bin/busybox $fs/sbin/mdev
    9.10  	$src/slitaz/list_modules.sh drivers/usb/input/usbmouse.ko | while read module; do
    9.11  		dir=$path/$(dirname $module)
    9.12  		[ -d $fs/$dir ] || mkdir -p $fs/$dir
    10.1 --- a/module-usbserial/receipt	Wed Mar 30 01:57:51 2016 +0300
    10.2 +++ b/module-usbserial/receipt	Wed Mar 30 09:53:55 2016 +0200
    10.3 @@ -17,7 +17,8 @@
    10.4  	export src=$WOK/$WANTED/source/linux-$VERSION
    10.5  	export _pkg=$WOK/$WANTED/install
    10.6  	path=lib/modules/$(ls $_pkg/lib/modules)/kernel
    10.7 -	mkdir -p $fs/$path $fs/dev
    10.8 +	mkdir -p $fs/$path $fs/sbin $fs/dev
    10.9 +	ln -s /bin/busybox $fs/sbin/mdev
   10.10  	$src/slitaz/list_modules.sh drivers/usb/serial/usbserial.ko | while read module; do
   10.11  		dir=$path/$(dirname $module)
   10.12  		[ -d $fs/$dir ] || mkdir -p $fs/$dir