wok-next rev 5749

busybox: ensure mod is 4755 (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Jul 02 17:01:04 2010 +0200 (2010-07-02)
parents 609498d2778d
children 3b4fadc87af4
files busybox-pam/receipt busybox/receipt
line diff
     1.1 --- a/busybox-pam/receipt	Fri Jul 02 12:30:41 2010 +0200
     1.2 +++ b/busybox-pam/receipt	Fri Jul 02 17:01:04 2010 +0200
     1.3 @@ -49,7 +49,6 @@
     1.4  genpkg_rules()
     1.5  {
     1.6      cp -a $src/_install/* $fs
     1.7 -    chmod 4755 $fs/bin/busybox
     1.8      rm -f $fs/sbin/depmod $fs/usr/bin/ar
     1.9      cp -a stuff/etc $fs
    1.10      mkdir -p $fs/etc/init.d
    1.11 @@ -98,7 +97,7 @@
    1.12  	fi
    1.13  	answer=""
    1.14  	while read i ; do
    1.15 -		[ -e $ROOT$i ] || continue
    1.16 +		[ -e $1$i ] || continue
    1.17  		if [ -z "$answer" ]; then
    1.18  			echo -n "Keep installed GNU utilities ? "
    1.19  			read answer
    1.20 @@ -107,7 +106,7 @@
    1.21  			*) break;;
    1.22  			esac
    1.23  		fi
    1.24 -		mv $ROOT$i $ROOT$i-busybox-install
    1.25 +		mv $1$i $1$i-busybox-install
    1.26  	done < $1$INSTALLED/$PACKAGE/files.list
    1.27  }
    1.28  
    1.29 @@ -116,7 +115,8 @@
    1.30  	local i
    1.31  	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
    1.32  	while read i ; do
    1.33 -		[ -e $ROOT$i-busybox-install ] || continue
    1.34 -		mv $ROOT$i-busybox-install $ROOT$i
    1.35 +		[ -e $1$i-busybox-install ] || continue
    1.36 +		mv $1$i-busybox-install $1$i
    1.37  	done < $1$INSTALLED/$PACKAGE/files.list
    1.38 +	chmod 4755 $1/bin/busybox
    1.39  }
     2.1 --- a/busybox/receipt	Fri Jul 02 12:30:41 2010 +0200
     2.2 +++ b/busybox/receipt	Fri Jul 02 17:01:04 2010 +0200
     2.3 @@ -51,7 +51,6 @@
     2.4  genpkg_rules()
     2.5  {
     2.6      cp -a $src/_install/* $fs
     2.7 -    chmod 4755 $fs/bin/busybox
     2.8      rm -f $fs/sbin/depmod $fs/usr/bin/ar
     2.9      mkdir -p $fs/etc/init.d
    2.10      # Busybox config files.
    2.11 @@ -91,7 +90,7 @@
    2.12  	fi
    2.13  	answer=""
    2.14  	while read i ; do
    2.15 -		[ -e $ROOT$i ] || continue
    2.16 +		[ -e $1$i ] || continue
    2.17  		if [ -z "$answer" ]; then
    2.18  			echo -n "Keep installed GNU utilities ? "
    2.19  			read -t 30 answer	# by default: keep
    2.20 @@ -100,7 +99,7 @@
    2.21  			*) ;;
    2.22  			esac
    2.23  		fi
    2.24 -		mv $ROOT$i $ROOT$i-busybox-install
    2.25 +		mv $1$i $1$i-busybox-install
    2.26  	done < $1$INSTALLED/$PACKAGE/files.list
    2.27  }
    2.28  
    2.29 @@ -109,7 +108,8 @@
    2.30  	local i
    2.31  	mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf
    2.32  	while read i ; do
    2.33 -		[ -e $ROOT$i-busybox-install ] || continue
    2.34 -		mv $ROOT$i-busybox-install $ROOT$i
    2.35 +		[ -e $1$i-busybox-install ] || continue
    2.36 +		mv $1$i-busybox-install $1$i
    2.37  	done < $1$INSTALLED/$PACKAGE/files.list
    2.38 +	chmod 4755 $1/bin/busybox
    2.39  }