wok diff busybox/receipt @ rev 8237

busybox: do not duplicate code
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Jan 27 11:56:53 2011 +0100 (2011-01-27)
parents b82864bfba60
children 0d7cf47babb3
line diff
     1.1 --- a/busybox/receipt	Thu Jan 27 11:52:18 2011 +0100
     1.2 +++ b/busybox/receipt	Thu Jan 27 11:56:53 2011 +0100
     1.3 @@ -12,8 +12,7 @@
     1.4  WGET_URL="http://www.busybox.net/downloads/$TARBALL"
     1.5  CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf /etc/resolv.conf"
     1.6  
     1.7 -# Rules to compile & install the temporary toolchain.
     1.8 -cook_tmp_toolchain()
     1.9 +apply_bb_patchs()
    1.10  {
    1.11      cd $src
    1.12      while read file; do
    1.13 @@ -30,6 +29,12 @@
    1.14  cmdline.u
    1.15  EOT
    1.16      cp ../stuff/$PACKAGE-$VERSION.config .config
    1.17 +}
    1.18 +
    1.19 +# Rules to compile & install the temporary toolchain.
    1.20 +cook_tmp_toolchain()
    1.21 +{
    1.22 +    apply_bb_patchs
    1.23      { make oldconfig &&
    1.24      make  &&
    1.25      make CONFIG_PREFIX=/tools install
    1.26 @@ -41,21 +46,7 @@
    1.27  # Rules to configure and make the package.
    1.28  compile_rules()
    1.29  {
    1.30 -    cd $src
    1.31 -    while read file; do
    1.32 -    	[ -f done.$file ] && continue
    1.33 -    	echo "Apply $file..."
    1.34 -    	patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1
    1.35 -	touch done.$file
    1.36 -    done <<EOT
    1.37 -tar.u
    1.38 -stat.u
    1.39 -ris.u
    1.40 -zmodules.u
    1.41 -printable.u
    1.42 -cmdline.u
    1.43 -EOT
    1.44 -    cp ../stuff/$PACKAGE-$VERSION.config .config
    1.45 +    apply_bb_patchs
    1.46      make oldconfig
    1.47      make || return 1
    1.48  	make install || return 1