# HG changeset patch # User Pascal Bellard # Date 1452719631 -3600 # Node ID 67f5b3bae0a80273bf6587b8c8d86cf14507b1e3 # Parent dfc51ce7954a3d49cf2c7b79ba24d8985f16908a Up vanessa_adt (0.0.9), vanessa_logger (0.0.10), vanessa_socket (0.0.12) diff -r dfc51ce7954a -r 67f5b3bae0a8 syslinux/stuff/extra/md5sum.c --- a/syslinux/stuff/extra/md5sum.c Tue Jan 12 19:09:34 2016 +0200 +++ b/syslinux/stuff/extra/md5sum.c Wed Jan 13 22:13:51 2016 +0100 @@ -698,7 +698,7 @@ #include #include -const char *progname = "linux.c32"; +const char *progname = "c32box.c32"; /* Find the last instance of a particular command line argument (which should include the final =; do not use for boolean arguments) */ diff -r dfc51ce7954a -r 67f5b3bae0a8 syslinux/stuff/iso2exe/init --- a/syslinux/stuff/iso2exe/init Tue Jan 12 19:09:34 2016 +0200 +++ b/syslinux/stuff/iso2exe/init Wed Jan 13 22:13:51 2016 +0100 @@ -1192,6 +1192,13 @@ [ -x /usr/s$BIN ] || mv /bin/mount.posixovl.iso2exe \ /usr/s$BIN 2> /dev/null || mv /bin/mount.posixovl.iso2exe /$BIN 2> /dev/null mount_proc +for i in /sys/block/*/dev /sys/block/*/*/dev ; do + [ -s "$i" ] || continue + n=${i%/dev} + n=/dev/${n##*/} + [ -e $n ] && continue + mknod $n b $(sed 's/:/ /' < $i) +done ISO="$(getarg bootfrom | sed 's/.://;s|\\|/|g')" getiso mount_loram diff -r dfc51ce7954a -r 67f5b3bae0a8 syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Tue Jan 12 19:09:34 2016 +0200 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Wed Jan 13 22:13:51 2016 +0100 @@ -35,7 +35,7 @@ { TMP=/tmp/iso2exe$$ mkdir -p $TMP/bin $TMP/dev - cp -a /dev/?d?* /dev/tty /dev/tty0 $TMP/dev + cp -a /dev/tty /dev/tty0 $TMP/dev $0 --get init > $TMP/init.exe # mount -o loop,ro $1 $TMP # oldslitaz="$(ls $TMP/boot/isolinux/splash.lss 2> /dev/null)" @@ -125,6 +125,49 @@ fi } +fileofs() +{ + [ $(get 1024 $ISO) -eq 35615 ] && i=1024 || i=$((512*(1+$(get 417 $ISO 1)))) + stub=$(($(get 20 $ISO) - 0xC0)) + SIZE=0; OFFSET=0 + case "$1" in + win32.exe) [ $i -eq 1024 ] || SIZE=$(($i - 512));; + syslinux.mbr) [ $i -eq 1024 ] || OFFSET=$(($i - 512)); SIZE=512;; + flavor.info) OFFSET=$i; SIZE=-1;; + floppy.boot) SIZE=$(($(get 26 $ISO 1)*512)) + OFFSET=$(($(get 64 $ISO) - 0xC0 - $SIZE));; + rootfs.gz) SIZE=$(get 24 $ISO); OFFSET=$(($stub - $SIZE));; + tazboot.com) OFFSET=$(($(get 64 $ISO) - 0xC0)) + SIZE=$(($stub - $(get 24 $ISO) - $OFFSET));; + dosstub) OFFSET=$stub; SIZE=$((0x8000 - $OFFSET));; + md5) OFFSET=$((0x7FF0)); SIZE=16;; + esac +} + +list() +{ + for f in win32.exe syslinux.mbr flavor.info floppy.boot \ + dosstub rootfs.gz tazboot.com md5 ; do + fileofs $f + [ $SIZE -eq 0 ] && continue + echo -n "$f at $(printf "%X\n" $OFFSET)" + [ $SIZE -eq -1 ] || echo -n " ($SIZE bytes)" + echo . + done +} + +extract() +{ + for f in $@; do + fileofs $f + case "$SIZE" in + 0) ;; + -1) ddq bs=1 count=20480 skip=$OFFSET if="$ISO" | zcat >$f ;; + *) ddq bs=1 count=$SIZE skip=$OFFSET if="$ISO" >$f ;; + esac + done +} + custom_config_sector() { echo $(($(get 32848 "$1" 4)+16)) @@ -304,6 +347,9 @@ -i*) initrd="$2" ; shift 2 ;; -e*) extract_custom_config "$2" exit ;; + -r*) ISO="$2" ; shift 2 + [ -z "$1" ] && list || extract $@ + exit ;; *) cat > /dev/null break esac diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_adt-dev/receipt --- a/vanessa_adt-dev/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_adt-dev/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="vanessa_adt-dev" -VERSION="0.0.6" +VERSION="0.0.9" CATEGORY="development" SHORT_DESC="Abstract Data Types development files." MAINTAINER="pascal.bellard@slitaz.org" @@ -9,6 +9,8 @@ WEB_SITE="http://www.vergenet.net/linux/vanessa" WANTED="vanessa_adt" +DEPENDS="vanessa_adt" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { @@ -16,4 +18,3 @@ cp -a $install/usr/include $fs/usr cp -a $install/usr/lib/*a $fs/usr/lib } - diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_adt/receipt --- a/vanessa_adt/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_adt/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,12 +1,12 @@ # SliTaz package receipt. PACKAGE="vanessa_adt" -VERSION="0.0.6" +VERSION="0.0.9" CATEGORY="network" SHORT_DESC="Abstract Data Types." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" -TARBALL="$PACKAGE-$VERSION.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.vergenet.net/linux/vanessa" WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" @@ -16,9 +16,8 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS && + --mandir=/usr/share/man $CONFIGURE_ARGS && make && make DESTDIR=$DESTDIR install } @@ -29,4 +28,3 @@ mkdir -p $fs/usr/lib cp -a $install/usr/lib/*.so* $fs/usr/lib } - diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_logger-dev/receipt --- a/vanessa_logger-dev/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_logger-dev/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="vanessa_logger-dev" -VERSION="0.0.7" +VERSION="0.0.10" CATEGORY="development" SHORT_DESC="generic logging layer development files." MAINTAINER="pascal.bellard@slitaz.org" @@ -9,11 +9,13 @@ WEB_SITE="http://www.vergenet.net/linux/vanessa" WANTED="vanessa_logger" +DEPENDS="vanessa_logger pkg-config" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib cp -a $install/usr/include $fs/usr cp -a $install/usr/lib/*a $fs/usr/lib + cp -a $install/usr/lib/pkgconfig $fs/usr/lib } - diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_logger/receipt --- a/vanessa_logger/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_logger/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,19 +1,18 @@ # SliTaz package receipt. PACKAGE="vanessa_logger" -VERSION="0.0.7" +VERSION="0.0.10" CATEGORY="network" SHORT_DESC="generic logging layer." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" -TARBALL="$PACKAGE-$VERSION.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.bz2" WEB_SITE="http://www.vergenet.net/linux/vanessa" WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" # Rules to configure and make the package. compile_rules() { - cd $src ./configure && make && make DESTDIR=$DESTDIR install } @@ -24,13 +23,4 @@ mkdir -p $fs/usr/lib cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib/*.so* $fs/usr/lib - for i in $(cd $WOK; ls -d vanessa_logger-*) - do - if [ -x /usr/bin/cook ]; then - cook $i - else - tazwok cook $i - fi - done } - diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_socket-dev/receipt --- a/vanessa_socket-dev/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_socket-dev/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,7 +1,7 @@ # SliTaz package receipt. PACKAGE="vanessa_socket-dev" -VERSION="0.0.7" +VERSION="0.0.12" CATEGORY="development" SHORT_DESC="Simplifies TCP/IP socket operations, development files." MAINTAINER="pascal.bellard@slitaz.org" @@ -9,11 +9,13 @@ WEB_SITE="http://www.vergenet.net/linux/vanessa" WANTED="vanessa_socket" +DEPENDS="vanessa_socket pkg-config" + # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib cp -a $install/usr/include $fs/usr cp -a $install/usr/lib/*a $fs/usr/lib + cp -a $install/usr/lib/pkgconfig $fs/usr/lib } - diff -r dfc51ce7954a -r 67f5b3bae0a8 vanessa_socket/receipt --- a/vanessa_socket/receipt Tue Jan 12 19:09:34 2016 +0200 +++ b/vanessa_socket/receipt Wed Jan 13 22:13:51 2016 +0100 @@ -1,12 +1,12 @@ # SliTaz package receipt. PACKAGE="vanessa_socket" -VERSION="0.0.7" +VERSION="0.0.12" CATEGORY="network" SHORT_DESC="Simplifies TCP/IP socket operations." MAINTAINER="pascal.bellard@slitaz.org" LICENSE="LGPL2.1" -TARBALL="$PACKAGE-$VERSION.tar.gz" +TARBALL="$PACKAGE-$VERSION.tar.be2" WEB_SITE="http://www.vergenet.net/linux/vanessa" WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" @@ -16,9 +16,8 @@ # Rules to configure and make the package. compile_rules() { - cd $src ./configure --prefix=/usr --infodir=/usr/share/info \ - --mandir=/usr/share/man $CONFIGURE_ARGS + --mandir=/usr/share/man $CONFIGURE_ARGS make make DESTDIR=$DESTDIR install } @@ -30,4 +29,3 @@ cp -a $install/usr/bin $fs/usr cp -a $install/usr/lib/*.so* $fs/usr/lib } -