wok rev 18804
Up vanessa_adt (0.0.9), vanessa_logger (0.0.10), vanessa_socket (0.0.12)
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Jan 13 22:13:51 2016 +0100 (2016-01-13) |
| parents | dfc51ce7954a |
| children | 4303f41bd245 |
| files | syslinux/stuff/extra/md5sum.c syslinux/stuff/iso2exe/init syslinux/stuff/iso2exe/iso2exe.sh vanessa_adt-dev/receipt vanessa_adt/receipt vanessa_logger-dev/receipt vanessa_logger/receipt vanessa_socket-dev/receipt vanessa_socket/receipt |
line diff
1.1 --- a/syslinux/stuff/extra/md5sum.c Tue Jan 12 19:09:34 2016 +0200 1.2 +++ b/syslinux/stuff/extra/md5sum.c Wed Jan 13 22:13:51 2016 +0100 1.3 @@ -698,7 +698,7 @@ 1.4 #include <syslinux/linux.h> 1.5 #include <syslinux/pxe.h> 1.6 1.7 -const char *progname = "linux.c32"; 1.8 +const char *progname = "c32box.c32"; 1.9 1.10 /* Find the last instance of a particular command line argument 1.11 (which should include the final =; do not use for boolean arguments) */
2.1 --- a/syslinux/stuff/iso2exe/init Tue Jan 12 19:09:34 2016 +0200 2.2 +++ b/syslinux/stuff/iso2exe/init Wed Jan 13 22:13:51 2016 +0100 2.3 @@ -1192,6 +1192,13 @@ 2.4 [ -x /usr/s$BIN ] || mv /bin/mount.posixovl.iso2exe \ 2.5 /usr/s$BIN 2> /dev/null || mv /bin/mount.posixovl.iso2exe /$BIN 2> /dev/null 2.6 mount_proc 2.7 +for i in /sys/block/*/dev /sys/block/*/*/dev ; do 2.8 + [ -s "$i" ] || continue 2.9 + n=${i%/dev} 2.10 + n=/dev/${n##*/} 2.11 + [ -e $n ] && continue 2.12 + mknod $n b $(sed 's/:/ /' < $i) 2.13 +done 2.14 ISO="$(getarg bootfrom | sed 's/.://;s|\\|/|g')" 2.15 getiso 2.16 mount_loram
3.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh Tue Jan 12 19:09:34 2016 +0200 3.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Wed Jan 13 22:13:51 2016 +0100 3.3 @@ -35,7 +35,7 @@ 3.4 { 3.5 TMP=/tmp/iso2exe$$ 3.6 mkdir -p $TMP/bin $TMP/dev 3.7 - cp -a /dev/?d?* /dev/tty /dev/tty0 $TMP/dev 3.8 + cp -a /dev/tty /dev/tty0 $TMP/dev 3.9 $0 --get init > $TMP/init.exe 3.10 # mount -o loop,ro $1 $TMP 3.11 # oldslitaz="$(ls $TMP/boot/isolinux/splash.lss 2> /dev/null)" 3.12 @@ -125,6 +125,49 @@ 3.13 fi 3.14 } 3.15 3.16 +fileofs() 3.17 +{ 3.18 + [ $(get 1024 $ISO) -eq 35615 ] && i=1024 || i=$((512*(1+$(get 417 $ISO 1)))) 3.19 + stub=$(($(get 20 $ISO) - 0xC0)) 3.20 + SIZE=0; OFFSET=0 3.21 + case "$1" in 3.22 + win32.exe) [ $i -eq 1024 ] || SIZE=$(($i - 512));; 3.23 + syslinux.mbr) [ $i -eq 1024 ] || OFFSET=$(($i - 512)); SIZE=512;; 3.24 + flavor.info) OFFSET=$i; SIZE=-1;; 3.25 + floppy.boot) SIZE=$(($(get 26 $ISO 1)*512)) 3.26 + OFFSET=$(($(get 64 $ISO) - 0xC0 - $SIZE));; 3.27 + rootfs.gz) SIZE=$(get 24 $ISO); OFFSET=$(($stub - $SIZE));; 3.28 + tazboot.com) OFFSET=$(($(get 64 $ISO) - 0xC0)) 3.29 + SIZE=$(($stub - $(get 24 $ISO) - $OFFSET));; 3.30 + dosstub) OFFSET=$stub; SIZE=$((0x8000 - $OFFSET));; 3.31 + md5) OFFSET=$((0x7FF0)); SIZE=16;; 3.32 + esac 3.33 +} 3.34 + 3.35 +list() 3.36 +{ 3.37 + for f in win32.exe syslinux.mbr flavor.info floppy.boot \ 3.38 + dosstub rootfs.gz tazboot.com md5 ; do 3.39 + fileofs $f 3.40 + [ $SIZE -eq 0 ] && continue 3.41 + echo -n "$f at $(printf "%X\n" $OFFSET)" 3.42 + [ $SIZE -eq -1 ] || echo -n " ($SIZE bytes)" 3.43 + echo . 3.44 + done 3.45 +} 3.46 + 3.47 +extract() 3.48 +{ 3.49 + for f in $@; do 3.50 + fileofs $f 3.51 + case "$SIZE" in 3.52 + 0) ;; 3.53 + -1) ddq bs=1 count=20480 skip=$OFFSET if="$ISO" | zcat >$f ;; 3.54 + *) ddq bs=1 count=$SIZE skip=$OFFSET if="$ISO" >$f ;; 3.55 + esac 3.56 + done 3.57 +} 3.58 + 3.59 custom_config_sector() 3.60 { 3.61 echo $(($(get 32848 "$1" 4)+16)) 3.62 @@ -304,6 +347,9 @@ 3.63 -i*) initrd="$2" ; shift 2 ;; 3.64 -e*) extract_custom_config "$2" 3.65 exit ;; 3.66 + -r*) ISO="$2" ; shift 2 3.67 + [ -z "$1" ] && list || extract $@ 3.68 + exit ;; 3.69 *) cat > /dev/null 3.70 break 3.71 esac
4.1 --- a/vanessa_adt-dev/receipt Tue Jan 12 19:09:34 2016 +0200 4.2 +++ b/vanessa_adt-dev/receipt Wed Jan 13 22:13:51 2016 +0100 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="vanessa_adt-dev" 4.7 -VERSION="0.0.6" 4.8 +VERSION="0.0.9" 4.9 CATEGORY="development" 4.10 SHORT_DESC="Abstract Data Types development files." 4.11 MAINTAINER="pascal.bellard@slitaz.org" 4.12 @@ -9,6 +9,8 @@ 4.13 WEB_SITE="http://www.vergenet.net/linux/vanessa" 4.14 WANTED="vanessa_adt" 4.15 4.16 +DEPENDS="vanessa_adt" 4.17 + 4.18 # Rules to gen a SliTaz package suitable for Tazpkg. 4.19 genpkg_rules() 4.20 { 4.21 @@ -16,4 +18,3 @@ 4.22 cp -a $install/usr/include $fs/usr 4.23 cp -a $install/usr/lib/*a $fs/usr/lib 4.24 } 4.25 -
5.1 --- a/vanessa_adt/receipt Tue Jan 12 19:09:34 2016 +0200 5.2 +++ b/vanessa_adt/receipt Wed Jan 13 22:13:51 2016 +0100 5.3 @@ -1,12 +1,12 @@ 5.4 # SliTaz package receipt. 5.5 5.6 PACKAGE="vanessa_adt" 5.7 -VERSION="0.0.6" 5.8 +VERSION="0.0.9" 5.9 CATEGORY="network" 5.10 SHORT_DESC="Abstract Data Types." 5.11 MAINTAINER="pascal.bellard@slitaz.org" 5.12 LICENSE="LGPL2.1" 5.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 5.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 5.15 WEB_SITE="http://www.vergenet.net/linux/vanessa" 5.16 WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" 5.17 5.18 @@ -16,9 +16,8 @@ 5.19 # Rules to configure and make the package. 5.20 compile_rules() 5.21 { 5.22 - cd $src 5.23 ./configure --prefix=/usr --infodir=/usr/share/info \ 5.24 - --mandir=/usr/share/man $CONFIGURE_ARGS && 5.25 + --mandir=/usr/share/man $CONFIGURE_ARGS && 5.26 make && 5.27 make DESTDIR=$DESTDIR install 5.28 } 5.29 @@ -29,4 +28,3 @@ 5.30 mkdir -p $fs/usr/lib 5.31 cp -a $install/usr/lib/*.so* $fs/usr/lib 5.32 } 5.33 -
6.1 --- a/vanessa_logger-dev/receipt Tue Jan 12 19:09:34 2016 +0200 6.2 +++ b/vanessa_logger-dev/receipt Wed Jan 13 22:13:51 2016 +0100 6.3 @@ -1,7 +1,7 @@ 6.4 # SliTaz package receipt. 6.5 6.6 PACKAGE="vanessa_logger-dev" 6.7 -VERSION="0.0.7" 6.8 +VERSION="0.0.10" 6.9 CATEGORY="development" 6.10 SHORT_DESC="generic logging layer development files." 6.11 MAINTAINER="pascal.bellard@slitaz.org" 6.12 @@ -9,11 +9,13 @@ 6.13 WEB_SITE="http://www.vergenet.net/linux/vanessa" 6.14 WANTED="vanessa_logger" 6.15 6.16 +DEPENDS="vanessa_logger pkg-config" 6.17 + 6.18 # Rules to gen a SliTaz package suitable for Tazpkg. 6.19 genpkg_rules() 6.20 { 6.21 mkdir -p $fs/usr/lib 6.22 cp -a $install/usr/include $fs/usr 6.23 cp -a $install/usr/lib/*a $fs/usr/lib 6.24 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 6.25 } 6.26 -
7.1 --- a/vanessa_logger/receipt Tue Jan 12 19:09:34 2016 +0200 7.2 +++ b/vanessa_logger/receipt Wed Jan 13 22:13:51 2016 +0100 7.3 @@ -1,19 +1,18 @@ 7.4 # SliTaz package receipt. 7.5 7.6 PACKAGE="vanessa_logger" 7.7 -VERSION="0.0.7" 7.8 +VERSION="0.0.10" 7.9 CATEGORY="network" 7.10 SHORT_DESC="generic logging layer." 7.11 MAINTAINER="pascal.bellard@slitaz.org" 7.12 LICENSE="LGPL2.1" 7.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 7.14 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.15 WEB_SITE="http://www.vergenet.net/linux/vanessa" 7.16 WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" 7.17 7.18 # Rules to configure and make the package. 7.19 compile_rules() 7.20 { 7.21 - cd $src 7.22 ./configure && 7.23 make && make DESTDIR=$DESTDIR install 7.24 } 7.25 @@ -24,13 +23,4 @@ 7.26 mkdir -p $fs/usr/lib 7.27 cp -a $install/usr/bin $fs/usr 7.28 cp -a $install/usr/lib/*.so* $fs/usr/lib 7.29 - for i in $(cd $WOK; ls -d vanessa_logger-*) 7.30 - do 7.31 - if [ -x /usr/bin/cook ]; then 7.32 - cook $i 7.33 - else 7.34 - tazwok cook $i 7.35 - fi 7.36 - done 7.37 } 7.38 -
8.1 --- a/vanessa_socket-dev/receipt Tue Jan 12 19:09:34 2016 +0200 8.2 +++ b/vanessa_socket-dev/receipt Wed Jan 13 22:13:51 2016 +0100 8.3 @@ -1,7 +1,7 @@ 8.4 # SliTaz package receipt. 8.5 8.6 PACKAGE="vanessa_socket-dev" 8.7 -VERSION="0.0.7" 8.8 +VERSION="0.0.12" 8.9 CATEGORY="development" 8.10 SHORT_DESC="Simplifies TCP/IP socket operations, development files." 8.11 MAINTAINER="pascal.bellard@slitaz.org" 8.12 @@ -9,11 +9,13 @@ 8.13 WEB_SITE="http://www.vergenet.net/linux/vanessa" 8.14 WANTED="vanessa_socket" 8.15 8.16 +DEPENDS="vanessa_socket pkg-config" 8.17 + 8.18 # Rules to gen a SliTaz package suitable for Tazpkg. 8.19 genpkg_rules() 8.20 { 8.21 mkdir -p $fs/usr/lib 8.22 cp -a $install/usr/include $fs/usr 8.23 cp -a $install/usr/lib/*a $fs/usr/lib 8.24 + cp -a $install/usr/lib/pkgconfig $fs/usr/lib 8.25 } 8.26 -
9.1 --- a/vanessa_socket/receipt Tue Jan 12 19:09:34 2016 +0200 9.2 +++ b/vanessa_socket/receipt Wed Jan 13 22:13:51 2016 +0100 9.3 @@ -1,12 +1,12 @@ 9.4 # SliTaz package receipt. 9.5 9.6 PACKAGE="vanessa_socket" 9.7 -VERSION="0.0.7" 9.8 +VERSION="0.0.12" 9.9 CATEGORY="network" 9.10 SHORT_DESC="Simplifies TCP/IP socket operations." 9.11 MAINTAINER="pascal.bellard@slitaz.org" 9.12 LICENSE="LGPL2.1" 9.13 -TARBALL="$PACKAGE-$VERSION.tar.gz" 9.14 +TARBALL="$PACKAGE-$VERSION.tar.be2" 9.15 WEB_SITE="http://www.vergenet.net/linux/vanessa" 9.16 WGET_URL="$WEB_SITE/download/$PACKAGE/$VERSION/$TARBALL" 9.17 9.18 @@ -16,9 +16,8 @@ 9.19 # Rules to configure and make the package. 9.20 compile_rules() 9.21 { 9.22 - cd $src 9.23 ./configure --prefix=/usr --infodir=/usr/share/info \ 9.24 - --mandir=/usr/share/man $CONFIGURE_ARGS 9.25 + --mandir=/usr/share/man $CONFIGURE_ARGS 9.26 make 9.27 make DESTDIR=$DESTDIR install 9.28 } 9.29 @@ -30,4 +29,3 @@ 9.30 cp -a $install/usr/bin $fs/usr 9.31 cp -a $install/usr/lib/*.so* $fs/usr/lib 9.32 } 9.33 -