Added busybox headers fix (_pre2) and changed utils to runtask on udev build (_pre3).

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@353 67a159dc-881f-0410-a524-ba9dfbe2cb84
cleanup-cruft
Chris Gianelloni 19 years ago
parent 6c07c8c985
commit b54bc4fdb4

@ -356,6 +356,12 @@ compile_busybox() {
cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config" cp "${BUSYBOX_CONFIG}" "${BUSYBOX_DIR}/.config"
sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g' sed -i ${BUSYBOX_DIR}/.config -e 's/#\? \?CONFIG_FEATURE_INSTALLER[ =].*/CONFIG_FEATURE_INSTALLER=y/g'
cd "${BUSYBOX_DIR}" cd "${BUSYBOX_DIR}"
if [ -f ${GK_SHARE}/pkg/busybox-1.00-headers_fix.patch ]
then
patch -p1 -i \
${GK_SHARE}/pkg/busybox-1.00-headers_fix.patch \
|| gen_die "Failed patching busybox"
fi
print_info 1 'busybox: >> Configuring...' print_info 1 'busybox: >> Configuring...'
yes '' 2>/dev/null | compile_generic oldconfig utils yes '' 2>/dev/null | compile_generic oldconfig utils
print_info 1 'busybox: >> Compiling...' print_info 1 'busybox: >> Compiling...'
@ -779,7 +785,7 @@ compile_udev() {
then then
compile_generic "EXTRAS=\"${extras}\" ARCH=sparc64 CROSS=sparc64-unknown-linux-gnu- USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" utils compile_generic "EXTRAS=\"${extras}\" ARCH=sparc64 CROSS=sparc64-unknown-linux-gnu- USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" utils
else else
compile_generic "EXTRAS=\"${extras}\" USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" utils compile_generic "EXTRAS=\"${extras}\" USE_KLIBC=true KLCC=${TEMP}/klibc-build/bin/klcc USE_LOG=false DEBUG=false udevdir=/dev all" runtask
fi fi

@ -2,7 +2,7 @@
# Genkernel v3 # Genkernel v3
PATH="/bin:/usr/bin:/sbin:/usr/sbin" PATH="/bin:/usr/bin:/sbin:/usr/sbin"
GK_V='3.3.11_pre1' GK_V='3.3.11_pre3'
TMPDIR='/var/tmp/genkernel' TMPDIR='/var/tmp/genkernel'
TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified. TODEBUGCACHE=1 # Until an error occurs or DEBUGFILE is fully qualified.

@ -0,0 +1,36 @@
diff -ur busybox-1.00-rt-mdstart.plasmaroo/coreutils/Config.in busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Config.in
--- busybox-1.00-rt-mdstart.plasmaroo/coreutils/Config.in 2004-08-11 03:45:47.000000000 +0100
+++ busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Config.in 2006-01-11 23:35:23.000000000 +0000
@@ -469,7 +469,7 @@
touch is used to create or change the access and/or
modification timestamp of specified files.
-config CONFIG_TR
+config CONFIG_TR_X
bool "tr"
default n
help
diff -ur busybox-1.00-rt-mdstart.plasmaroo/coreutils/Makefile.in busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Makefile.in
--- busybox-1.00-rt-mdstart.plasmaroo/coreutils/Makefile.in 2004-10-08 08:45:14.000000000 +0100
+++ busybox-1.00-rt-mdstart.plasmaroo.new/coreutils/Makefile.in 2006-01-11 23:35:32.000000000 +0000
@@ -74,7 +74,7 @@
COREUTILS-$(CONFIG_TEE) += tee.o
COREUTILS-$(CONFIG_TEST) += test.o
COREUTILS-$(CONFIG_TOUCH) += touch.o
-COREUTILS-$(CONFIG_TR) += tr.o
+COREUTILS-$(CONFIG_TR_X) += tr.o
COREUTILS-$(CONFIG_TRUE) += true.o
COREUTILS-$(CONFIG_TTY) += tty.o
COREUTILS-$(CONFIG_UNAME) += uname.o
diff -ur busybox-1.00-rt-mdstart.plasmaroo/include/applets.h busybox-1.00-rt-mdstart.plasmaroo.new/include/applets.h
--- busybox-1.00-rt-mdstart.plasmaroo/include/applets.h 2006-01-11 23:29:22.000000000 +0000
+++ busybox-1.00-rt-mdstart.plasmaroo.new/include/applets.h 2006-01-11 23:35:30.000000000 +0000
@@ -586,7 +586,7 @@
#ifdef CONFIG_TOUCH
APPLET(touch, touch_main, _BB_DIR_BIN, _BB_SUID_NEVER)
#endif
-#ifdef CONFIG_TR
+#ifdef CONFIG_TR_X
APPLET(tr, tr_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
#endif
#ifdef CONFIG_TRACEROUTE
Loading…
Cancel
Save