add makeopts params, and fixes for if old coreutils is in root

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@38 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/gen_cmdline.sh b/gen_cmdline.sh
index bcb36b6c43f0a1cf1aca813fcd8b5e7a08ca13f2..1a427004853b5239f254c6c45c1d2fe008c8697d 100755 (executable)
--- a/gen_cmdline.sh
+++ b/gen_cmdline.sh
@@ -36,6 +36,7 @@ usage() {
   echo "       --utils-ld=<linker>     Linker to use for utils"
   echo "       --utils-as=<assembler>  Assembler to use for utils"
   echo "       --utils-make=<makeprog> GNU Make to use for utils"
+  echo "       --makeopts=<makeopts>   Make Opts such as -j2, etc"
   echo "  Internals"
   echo "       --arch-override=<arch>  Force to arch instead of autodetect (cross-compile?)"
   echo "       --busybox-config=<file> Busybox configuration file to use"
@@ -96,12 +97,14 @@ parse_cmdline() {
                                CMD_UTILS_MAKE=`parse_opt "${x}"`
                                print_info 2 "CMD_UTILS_MAKE: $CMD_UTILS_MAKE"
                        ;;
-                       
+                       --makeopts*)
+                               CMD_MAKEOPTS=`parse_opt "${x}"`
+                               print_info 2 "CMD_MAKEOPTS: $CMD_MAKEOPTS"
+                       ;;                      
                        --debuglevel*)
                                CMD_DEBUGLEVEL=`parse_opt "${x}"`
                                DEBUGLEVEL="${CMD_DEBUGLEVEL}"
                                print_info 2 "CMD_DEBUGLEVEL: $CMD_DEBUGLEVEL"
-
                        ;;
                        --menuconfig)
                                CMD_MENUCONFIG=1

diff --git a/gen_determineargs.sh b/gen_determineargs.sh
index d5d2d59da8a067de3dc6345f76f495dd12ee33ec..af7f52e3f9e9ffbee859feb8084970127ca08113 100644 (file)
--- a/gen_determineargs.sh
+++ b/gen_determineargs.sh
@@ -16,7 +16,11 @@ get_KV() {
 }
 
 determine_real_args() {
-       MAKEOPTS="-j2"
+       if [ "${CMD_MAKEOPTS}" != "" ]
+       then
+               MAKEOPTS="${CMD_MAKEOPTS}"
+       fi
+
        if [ "${CMD_KERNELDIR}" != "" ]
        then
                KERNEL_DIR=${CMD_KERNELDIR}

diff --git a/generic/linuxrc b/generic/linuxrc
index 67f27a0ed5969ae0e6644390c27182a659eac8a2..de97732f4d70eb5b1db2c61e9978b9a624b93d58 100644 (file)
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -171,7 +171,11 @@ echo "STEP 6: pivot_root and exec/chroot real init"
 cd /newroot
 pivot_root . tmp/.initrd
 
-if [ "${USE_DEVFS_NORMAL}" -eq "1" -a "${CDROOT}" -eq "0" ]
+# We cannot use  if [ this = that ]  after a pivot_root as 
+# an old version of coreutils in real_root does not support
+# that style, noted by Weeve
+
+if test "${USE_DEVFS_NORMAL}" -eq "1" -a "${CDROOT}" -eq "0" 
 then
        # must mount a new devfs before we can
        # umount the old one for some reason

diff --git a/parisc/config.sh b/parisc/config.sh
index f122c8c4020084a5b9b5d5dba44b3f401d49c6b7..dfcf56afd62fddb747e8e45a8f01d3ed26e876a6 100644 (file)
--- a/parisc/config.sh
+++ b/parisc/config.sh
@@ -22,3 +22,5 @@ UTILS_LD=ld
 
 COMPRESS_INITRD=yes
 
+MAKEOPTS="-j2"
+

diff --git a/sparc/config.sh b/sparc/config.sh
index c995baeb2eb4966ec8d54cd44425a60aed585ff7..59be438b985d4fc88956638e61e4cc476110b727 100644 (file)
--- a/sparc/config.sh
+++ b/sparc/config.sh
@@ -9,6 +9,8 @@ KERNEL_BINARY="vmlinux"
 # other stuff seems to compile fine though
 USE_DIETLIBC=0
 
+MAKEOPTS="-j2"
+
 KERNEL_MAKE=make
 UTILS_MAKE=make
 

diff --git a/sparc64/config.sh b/sparc64/config.sh
index 68ab591a36aca45e50b107297e4c84a85d690848..39aae4b17deaef30836dd245e2c4f6afca2e3f0c 100644 (file)
--- a/sparc64/config.sh
+++ b/sparc64/config.sh
@@ -9,6 +9,8 @@ KERNEL_BINARY="arch/sparc64/boot/image"
 # can turn this flag on
 USE_DIETLIBC=0
 
+MAKEOPTS="-j2"
+
 KERNEL_MAKE=make
 UTILS_MAKE=make
 

diff --git a/x86/config.sh b/x86/config.sh
index 29f566f2647bdb3f8dd1d2aa7fa137d2d3aacad5..7a2f372dff087b76fe01b60aad282785eb9dbb61 100644 (file)
--- a/x86/config.sh
+++ b/x86/config.sh
@@ -9,6 +9,8 @@ KERNEL_BINARY="arch/i386/boot/bzImage"
 # other stuff seems to compile fine though
 USE_DIETLIBC=1
 
+MAKEOPTS="-j2"
+
 KERNEL_MAKE=make
 UTILS_MAKE=make
 

diff --git a/x86_64/config.sh b/x86_64/config.sh
index 651172c822371f227c0afdcfbdbcc027c993b4f8..c210b5b7ffe22f6e6f97d19650cda4ae1c47dcea 100644 (file)
--- a/x86_64/config.sh
+++ b/x86_64/config.sh
@@ -7,6 +7,8 @@ KERNEL_BINARY="arch/x86_64/boot/bzImage"
 
 USE_DIETLIBC=1
 
+MAKEOPTS="-j2"
+
 KERNEL_MAKE=make
 UTILS_MAKE=make