Author: jcrouse Date: 2007-12-12 23:52:48 +0100 (Wed, 12 Dec 2007) New Revision: 82
Modified: buildrom-devel/Config.in buildrom-devel/config/payloads/Config.in buildrom-devel/packages/kernel/kernel.inc buildrom-devel/packages/uclibc/uclibc.mk buildrom-devel/scripts/Build.settings Log: [BUILDROM] Some fixes
Remove a spurious variable from the GPXE stuff, rearrange the menu a little bit, and switch the Make jobs to an integer to make it easier to understand and use.
Signed-off-by: Jordan Crouse jordan.crouse@amd.com Acked-by: Ward Vandewege ward@gnu.org
Modified: buildrom-devel/Config.in =================================================================== --- buildrom-devel/Config.in 2007-12-10 18:57:06 UTC (rev 81) +++ buildrom-devel/Config.in 2007-12-12 22:52:48 UTC (rev 82) @@ -6,6 +6,25 @@ bool default y
+config ADVANCED + bool "Enable advanced operations" + default n + help + Allow yourself to do advanced developer things + +config EXPERIMENTAL + bool "Enable experimental features" + default n + help + Experimental features are not yet ready for prime time and/or + completely broken. The features revealed by this setting are + likely to be only useful if you are a developer and want to + hack on buildrom. + + If you are not sure, say no. + +menu "Build Options" + config VERBOSE bool "See the build output on stdout" default n @@ -14,33 +33,18 @@ be saved off in a series of logs
config MAKE_JOBS - string "Send this option to make to parallelize builds" - default "-j1" + int "Number of make jobs to run simultaneously (experimental)" + default 1 help This can speed the build if you have more than one core that you would like to allow make to use. If you have a single processor, use - the default (-j1) otherwise, try processors+1 (-j5 for 4 processors). + the default (1) otherwise, you can specify the number of cores you + have plus 1 (for example, specify 5 if you have 4 cores).
- This option currently only speeds up the kernel and uClibc builds. - It was tried for: linuxbios (not passed through to fallback,etc.) - busybox (causes errors) + This option is currently used for the kernel and uClibc packages. +endmenu
-config ADVANCED - bool "Enable advanced operations" - default n - help - Allow yourself to do advanced developer things
-config EXPERIMENTAL - bool "Enable experimental features" - default n - help - Experimental features are not yet ready for prime time and/or - completely broken. The features revealed by this setting are likely to be - only useful if you are a developer and want to hack on buildrom. - - If you are not sure, say no. - menu "LinuxBIOS configuration"
config LINUXBIOS_V3
Modified: buildrom-devel/config/payloads/Config.in =================================================================== --- buildrom-devel/config/payloads/Config.in 2007-12-10 18:57:06 UTC (rev 81) +++ buildrom-devel/config/payloads/Config.in 2007-12-12 22:52:48 UTC (rev 82) @@ -15,7 +15,6 @@ config PAYLOAD_GPXE depends EXPERIMENTAL bool "GPXE" - select PAYLOAD
config PAYLOAD_ETHERBOOT depends !PLATFORM_M57SLI
Modified: buildrom-devel/packages/kernel/kernel.inc =================================================================== --- buildrom-devel/packages/kernel/kernel.inc 2007-12-10 18:57:06 UTC (rev 81) +++ buildrom-devel/packages/kernel/kernel.inc 2007-12-12 22:52:48 UTC (rev 82) @@ -52,7 +52,7 @@
$(KERNEL_BZIMAGE): $(KERNEL_SRC_DIR)/.config @ echo "Building kernel..." - @ $(MAKE) $(CONFIG_MAKE_JOBS) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ + @ $(MAKE) $(PARALLEL_MAKE) -C $(KERNEL_SRC_DIR) ARCH=$(KERNEL_BUILD_ARCH) \ KERNEL_CC="$(CC)" KERNEL_LD="$(LD)" > $(KERNEL_BUILD_LOG) 2>&1
$(OUTPUT_DIR)/bzImage: $(KERNEL_BZIMAGE)
Modified: buildrom-devel/packages/uclibc/uclibc.mk =================================================================== --- buildrom-devel/packages/uclibc/uclibc.mk 2007-12-10 18:57:06 UTC (rev 81) +++ buildrom-devel/packages/uclibc/uclibc.mk 2007-12-12 22:52:48 UTC (rev 82) @@ -39,7 +39,7 @@ $(UCLIBC_SRC_DIR)/lib/libc.a: $(UCLIBC_SRC_DIR)/.config @ echo "Building uclibc..." @ ( unset CFLAGS; unset LDFLAGS; \ - $(MAKE) $(CONFIG_MAKE_JOBS) -C $(UCLIBC_SRC_DIR) TARGET_ARCH="$(UCLIBC_ARCH)" \ + $(MAKE) $(PARALLEL_MAKE) -C $(UCLIBC_SRC_DIR) TARGET_ARCH="$(UCLIBC_ARCH)" \ CC="$(CC) $(CROSS_CFLAGS)" LD="$(LD) $(CROSS_LDFLAGS)" \ HOSTCC="$(HOST_CC)" KERNEL_SOURCE="$(KERNEL_SRC_DIR)" \ RUNTIME_PREFIX="/" \
Modified: buildrom-devel/scripts/Build.settings =================================================================== --- buildrom-devel/scripts/Build.settings 2007-12-10 18:57:06 UTC (rev 81) +++ buildrom-devel/scripts/Build.settings 2007-12-12 22:52:48 UTC (rev 82) @@ -78,5 +78,6 @@ HOST_LDFLAGS=
HOSTCC=$(HOST_CC) +PARALLEL_MAKE=-j$(CONFIG_MAKE_JOBS)
-export CC AS CFLAGS LDFLAGS ASFLAGS LIBS +export CC AS CFLAGS LDFLAGS ASFLAGS LIBS PARALLEL_MAKE