SliTaz Repositories

     1.1 --- a/busybox/receipt	Thu Jan 27 11:56:53 2011 +0100
     1.2 +++ b/busybox/receipt	Thu Jan 27 12:11:34 2011 +0100
     1.3 @@ -18,7 +18,7 @@
     1.4      while read file; do
     1.5      	[ -f done.$file ] && continue
     1.6      	echo "Apply $file..."
     1.7 -    	patch -p1 < ../stuff/$PACKAGE-$VERSION-$file || return 1
     1.8 +    	patch -p1 < ../stuff/$PACKAGE-${VERSION%.*}-$file || return 1
     1.9  	touch done.$file
    1.10      done <<EOT
    1.11  tar.u
    1.12 @@ -28,15 +28,15 @@
    1.13  printable.u
    1.14  cmdline.u
    1.15  EOT
    1.16 -    cp ../stuff/$PACKAGE-$VERSION.config .config
    1.17 +    cp ../stuff/$PACKAGE-${VERSION%.*}.config .config
    1.18  }
    1.19  
    1.20  # Rules to compile & install the temporary toolchain.
    1.21  cook_tmp_toolchain()
    1.22  {
    1.23 -    apply_bb_patchs
    1.24 -    { make oldconfig &&
    1.25 -    make  &&
    1.26 +    { apply_bb_patchs && 
    1.27 +    make oldconfig &&
    1.28 +    make &&
    1.29      make CONFIG_PREFIX=/tools install
    1.30      } || return 1
    1.31      echo "Chmod 4755 on busybox binary..."
    1.32 @@ -46,17 +46,16 @@
    1.33  # Rules to configure and make the package.
    1.34  compile_rules()
    1.35  {
    1.36 -    apply_bb_patchs
    1.37 -    make oldconfig
    1.38 -    make || return 1
    1.39 -	make install || return 1
    1.40 +    { apply_bb_patchs && 
    1.41 +    make oldconfig &&
    1.42 +    make &&
    1.43 +    make install
    1.44 +    } || return 1
    1.45      sed -i 's/# CONFIG_PAM is not set/CONFIG_PAM=y/' .config
    1.46 -    make oldconfig
    1.47 -	make || return 1
    1.48 +    { make oldconfig && make } || return 1
    1.49      mv busybox busybox-pam
    1.50 -    cp ../stuff/$PACKAGE-$VERSION.config-static .config
    1.51 -    make oldconfig
    1.52 -    make || return 1
    1.53 +    cp ../stuff/$PACKAGE-${VERSION%.*}.config-static .config
    1.54 +    { make oldconfig && make } || return 1
    1.55      mv busybox busybox-static
    1.56  }
    1.57