Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog9
-rw-r--r--alpha/busy-config4
-rw-r--r--gen_compile.sh12
-rw-r--r--generic/keymaps.tar.gzbin14070 -> 0 bytes
-rw-r--r--generic/linuxrc44
-rwxr-xr-xgenkernel2
-rw-r--r--ia64/busy-config4
-rw-r--r--mips/busy-config2
-rw-r--r--parisc/busy-config4
-rw-r--r--parisc64/busy-config4
-rw-r--r--ppc/busy-config4
-rw-r--r--ppc64/busy-config4
-rw-r--r--sparc/busy-config4
-rw-r--r--sparc64/busy-config4
-rw-r--r--um/busy-config3
-rw-r--r--x86/busy-config4
-rw-r--r--x86_64/busy-config4
-rw-r--r--xen0/busy-config4
-rw-r--r--xenU/busy-config4
19 files changed, 49 insertions, 71 deletions
diff --git a/ChangeLog b/ChangeLog
index 8cfb3a2..3013c41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> alpha/busy-config,
+ gen_compile.sh, -generic/keymaps.tar.gz, generic/linuxrc, genkernel,
+ ia64/busy-config, mips/busy-config, parisc/busy-config,
+ parisc64/busy-config, ppc/busy-config, ppc64/busy-config,
+ sparc/busy-config, sparc64/busy-config, um/busy-config, x86/busy-config,
+ x86_64/busy-config, xen0/busy-config, xenU/busy-config:
+ Removing generic/keymaps.tar.gz to replace it with a known-good copy. Blame
+ cvs2svn.
+
16 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_initrd.sh,
generic/linuxrc, genkernel:
Added patches from François-Xavier Roure <fx_roure@yahoo.fr> from bug
diff --git a/alpha/busy-config b/alpha/busy-config
index 0beef53..39fb6a0 100644
--- a/alpha/busy-config
+++ b/alpha/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/gen_compile.sh b/gen_compile.sh
index 702ba2d..8574380 100644
--- a/gen_compile.sh
+++ b/gen_compile.sh
@@ -414,6 +414,16 @@ compile_unionfs_utils() {
}
compile_busybox() {
+
+ # Delete cache if config is newer
+ if [ \
+ -f "${BUSYBOX_BINCACHE}" -a \
+ -f "${BUSYBOX_CONFIG}" -a \
+ "${BUSYBOX_BINCACHE}" -ot "${BUSYBOX_CONFIG}" ]
+ then
+ rm -rf "${BUSYBOX_BINCACHE}"
+ fi
+
if [ ! -f "${BUSYBOX_BINCACHE}" ]
then
[ -f "${BUSYBOX_SRCTAR}" ] ||
@@ -421,7 +431,7 @@ compile_busybox() {
[ -f "${BUSYBOX_CONFIG}" ] ||
gen_die "Cound not find busybox config file: ${BUSYBOX_CONFIG}!"
cd "${TEMP}"
- rm -rf ${BUSYBOX_DIR} > /dev/null
+ rm -rf "${BUSYBOX_DIR}" > /dev/null
/bin/tar -jxpf ${BUSYBOX_SRCTAR} ||
gen_die 'Could not extract busybox source tarball!'
[ -d "${BUSYBOX_DIR}" ] ||
diff --git a/generic/keymaps.tar.gz b/generic/keymaps.tar.gz
deleted file mode 100644
index d340983..0000000
--- a/generic/keymaps.tar.gz
+++ /dev/null
Binary files differ
diff --git a/generic/linuxrc b/generic/linuxrc
index 434b8f9..e22357f 100644
--- a/generic/linuxrc
+++ b/generic/linuxrc
@@ -731,49 +731,7 @@ then
umount /proc || echo '*: Failed to unmount the initrd /proc!'
echo -n '.'
- exec <${CONSOLE} >${CONSOLE} 2>&1
- echo '.'
-
- # Cleanup initramfs in the background
- # to reclaim initramfs tmpfs memoryspace
-
- INITRAMFS_FILES=`ls / | sed -e 's|dev||'`
- INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${CHROOT#/}||g"`
-
- if [ -n "${MEMORY}" ]
- then
- INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${MEMORY#/}||g"`
- fi
-
- if [ -n "${UNION}" ]
- then
- INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|${UNION#/}||g"`
- fi
- INITRAMFS_FILES=`echo ${INITRAMFS_FILES}|sed -e "s|newroot||g"`
-
- for i in ${INITRAMFS_FILES}
- do
- for j in `/bin/busybox find /$i 2> /dev/null`
- do
- if /bin/busybox [ ! -d "$j" -a "$j" != "/bin/busybox" ]
- then
- /bin/busybox rm -f "$j"
- fi
-
- if /bin/busybox [ -d "${j}" -a "${j}" != "/bin" -a "${j}" != "/dev" -a "${j}" != "/sys" ]
- then
- /bin/busybox rm -rf "$j"
- fi
- done
- done
- # End initramfs cleanup
-
- # Start the real root init
- (/bin/busybox sleep 3; /bin/busybox rm -r /bin/busybox /dev) &
- exec /bin/busybox chroot . /bin/sh <<- EOF
- exec /sbin/init ${REAL_INIT}
-EOF
-
+ exec switch_root -c "/dev/console" "${CHROOT}" /sbin/init ${REAL_INIT}
fi
splash 'verbose'
diff --git a/genkernel b/genkernel
index af983be..c39c76a 100755
--- a/genkernel
+++ b/genkernel
@@ -405,7 +405,7 @@ symlinker() {
local newThing=${BOOTDIR}/${base}-${fullVer}
local newSym=${BOOTDIR}/${base}
- local oldSym=${newsym}.old
+ local oldSym=${newSym}.old
local prevLink
local ret=0
diff --git a/ia64/busy-config b/ia64/busy-config
index 0beef53..39fb6a0 100644
--- a/ia64/busy-config
+++ b/ia64/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/mips/busy-config b/mips/busy-config
index 2b2cb32..d0721e6 100644
--- a/mips/busy-config
+++ b/mips/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
CONFIG_FEATURE_SORT_BIG=y
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
diff --git a/parisc/busy-config b/parisc/busy-config
index 0beef53..39fb6a0 100644
--- a/parisc/busy-config
+++ b/parisc/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/parisc64/busy-config b/parisc64/busy-config
index 0beef53..39fb6a0 100644
--- a/parisc64/busy-config
+++ b/parisc64/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/ppc/busy-config b/ppc/busy-config
index 0beef53..39fb6a0 100644
--- a/ppc/busy-config
+++ b/ppc/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/ppc64/busy-config b/ppc64/busy-config
index 0beef53..39fb6a0 100644
--- a/ppc64/busy-config
+++ b/ppc64/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/sparc/busy-config b/sparc/busy-config
index 0beef53..39fb6a0 100644
--- a/sparc/busy-config
+++ b/sparc/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/sparc64/busy-config b/sparc64/busy-config
index 0beef53..39fb6a0 100644
--- a/sparc64/busy-config
+++ b/sparc64/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/um/busy-config b/um/busy-config
index 259fae0..eec7edf 100644
--- a/um/busy-config
+++ b/um/busy-config
@@ -115,7 +115,7 @@ CONFIG_SLEEP=y
CONFIG_SORT=y
# CONFIG_FEATURE_SORT_REVERSE is not set
# CONFIG_FEATURE_SORT_UNIQUE is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
CONFIG_SYNC=y
CONFIG_TAIL=y
# CONFIG_FEATURE_FANCY_TAIL is not set
@@ -379,6 +379,7 @@ CONFIG_MDSTART=y
CONFIG_MORE=y
CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
CONFIG_SWAPONOFF=y
CONFIG_MOUNT=y
diff --git a/x86/busy-config b/x86/busy-config
index 0beef53..39fb6a0 100644
--- a/x86/busy-config
+++ b/x86/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/x86_64/busy-config b/x86_64/busy-config
index 0beef53..39fb6a0 100644
--- a/x86_64/busy-config
+++ b/x86_64/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/xen0/busy-config b/xen0/busy-config
index 0beef53..39fb6a0 100644
--- a/xen0/busy-config
+++ b/xen0/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set
diff --git a/xenU/busy-config b/xenU/busy-config
index 0beef53..39fb6a0 100644
--- a/xenU/busy-config
+++ b/xenU/busy-config
@@ -172,7 +172,7 @@ CONFIG_SORT=y
# CONFIG_FEATURE_SORT_BIG is not set
# CONFIG_STAT is not set
# CONFIG_FEATURE_STAT_FORMAT is not set
-# CONFIG_STTY is not set
+CONFIG_STTY=y
# CONFIG_SUM is not set
CONFIG_SYNC=y
CONFIG_TAIL=y
@@ -385,11 +385,11 @@ CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_MOUNT=y
CONFIG_FEATURE_MOUNT_NFS=y
CONFIG_PIVOT_ROOT=y
+CONFIG_SWITCH_ROOT=y
CONFIG_RDATE=y
# CONFIG_READPROFILE is not set
# CONFIG_SETARCH is not set
CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
CONFIG_UMOUNT=y
# CONFIG_FEATURE_UMOUNT_ALL is not set