wok rev 19677

isapnptools: shrink
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Feb 09 12:37:49 2017 +0100 (2017-02-09)
parents b0072f522c17
children 5e6810e4a860
files busybox-boot/receipt busybox-static/receipt isapnptools/receipt xarchive/receipt
line diff
     1.1 --- a/busybox-boot/receipt	Wed Feb 08 16:11:24 2017 +0100
     1.2 +++ b/busybox-boot/receipt	Thu Feb 09 12:37:49 2017 +0100
     1.3 @@ -6,10 +6,10 @@
     1.4  SHORT_DESC="Many common UNIX utilities for core-5in1/boot flavor."
     1.5  MAINTAINER="pascal.bellard@slitaz.org"
     1.6  LICENSE="GPL2"
     1.7 -WANTED="busybox"
     1.8  WEB_SITE="http://www.busybox.net/"
     1.9  CONFIG_FILES=""
    1.10  
    1.11 +WANTED="busybox"
    1.12  DEPENDS="linux syslinux"
    1.13  
    1.14  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.15 @@ -20,8 +20,10 @@
    1.16  	CHOICE=static
    1.17  	for i in uclibc musl diet ; do
    1.18  		[ -x $src/busybox-$i ] || continue
    1.19 -		[ $(stat -c %s $src/busybox-$i) -lt \
    1.20 -	          $(stat -c %s $src/busybox-$CHOICE) ] &&
    1.21 +		[ -x $src/busybox-$CHOICE ] &&
    1.22 +			[ $(stat -c %s $src/busybox-$i) -ge \
    1.23 +			  $(stat -c %s $src/busybox-$CHOICE) ] &&
    1.24 +			continue
    1.25  		CHOICE=$i
    1.26  	done
    1.27  	cp -a $src/busybox-$CHOICE $fs/usr/share/boot/bin/busybox
     2.1 --- a/busybox-static/receipt	Wed Feb 08 16:11:24 2017 +0100
     2.2 +++ b/busybox-static/receipt	Thu Feb 09 12:37:49 2017 +0100
     2.3 @@ -6,11 +6,12 @@
     2.4  SHORT_DESC="Busybox combines tiny versions of many common UNIX utilities."
     2.5  MAINTAINER="pascal.bellard@slitaz.org"
     2.6  LICENSE="GPL2"
     2.7 -DEPENDS=""
     2.8 -WANTED="busybox"
     2.9  WEB_SITE="http://www.busybox.net/"
    2.10  CONFIG_FILES=""
    2.11  
    2.12 +WANTED="busybox"
    2.13 +DEPENDS=""
    2.14 +
    2.15  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.16  genpkg_rules()
    2.17  {
    2.18 @@ -18,8 +19,10 @@
    2.19  	CHOICE=static
    2.20  	for i in uclibc musl diet ; do
    2.21  		[ -x $src/busybox-$i ] || continue
    2.22 -		[ $(stat -c %s $src/busybox-$i) -lt \
    2.23 -	          $(stat -c %s $src/busybox-$CHOICE) ] &&
    2.24 +		[ -x $src/busybox-$CHOICE ] &&
    2.25 +			[ $(stat -c %s $src/busybox-$i) -ge \
    2.26 +			  $(stat -c %s $src/busybox-$CHOICE) ] &&
    2.27 +			continue
    2.28  		CHOICE=$i
    2.29  	done
    2.30  	cp -a $src/busybox-$CHOICE $fs/usr/share/boot/busybox-static
    2.31 @@ -27,5 +30,5 @@
    2.32  
    2.33  post_install()
    2.34  {
    2.35 -    chmod 4755 "$1/usr/share/boot/busybox-static"
    2.36 +	chmod 4755 "$1/usr/share/boot/busybox-static"
    2.37  }
     3.1 --- a/isapnptools/receipt	Wed Feb 08 16:11:24 2017 +0100
     3.2 +++ b/isapnptools/receipt	Thu Feb 09 12:37:49 2017 +0100
     3.3 @@ -13,11 +13,12 @@
     3.4  # Rules to configure and make the package.
     3.5  compile_rules()
     3.6  {
     3.7 -	cd $src
     3.8 +	sed -i 's/pnpdump_main.$(OBJEXT)/isapnp_main.$(OBJEXT) &/' src/Makefile.*
     3.9 +	sed -i 's/return/if (!strcmp(basename(argv[0]),"isapnp")) return (isapnp_main(argc, argv));\n&/' src/pnpdump.c
    3.10  	./configure --prefix=/usr --bindir=/bin \
    3.11 -	--libexecdir=/usr/bin --mandir=/usr/share/man \
    3.12 -	$CONFIGURE_ARGS
    3.13 -	make
    3.14 +		--libexecdir=/usr/bin --mandir=/usr/share/man \
    3.15 +		$CONFIGURE_ARGS &&
    3.16 +	make &&
    3.17  	make DESTDIR=$DESTDIR install
    3.18  }
    3.19  
    3.20 @@ -25,5 +26,7 @@
    3.21  genpkg_rules()
    3.22  {
    3.23  	# move /usr/sbin/* /sbin to use pnptools *before* mounting /usr
    3.24 -	cp -a $install/usr/sbin $fs
    3.25 +	mkdir -p $fs/sbin
    3.26 +	cp -a $install/usr/sbin/pnpdump $fs/sbin
    3.27 +	ln $fs/sbin/pnpdump $fs/sbin/isapnp
    3.28  }
     4.1 --- a/xarchive/receipt	Wed Feb 08 16:11:24 2017 +0100
     4.2 +++ b/xarchive/receipt	Thu Feb 09 12:37:49 2017 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  LICENSE="GPL2"
     4.5  TARBALL="$PACKAGE-$VERSION.tar.gz"
     4.6  SUGGESTED="zip rar unace arj lha p7zip lzop linux-squashfs cromfs cabextract \
     4.7 -xz lrzip nanozip"
     4.8 +xz lrzip"
     4.9  WEB_SITE="http://xarchive.sourceforge.net/"
    4.10  WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    4.11