Removing generic/keymaps.tar.gz to replace it with a known-good copy. Blame cvs2svn.

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

diff --git a/ChangeLog b/ChangeLog
index 8cfb3a2acbd6c0dbcc1bdca2889b66cecddbda7c..3013c4107e36a38a9421e2bced9a54abd78b70be 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 702ba2d9a0889785510faaa74d4fe4bf20267df6..85743802512210ce4a027458f47043e2c5d9b8bc 100644 (file)
--- 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 (file)
index d340983..0000000
Binary files a/generic/keymaps.tar.gz and /dev/null differ

diff --git a/generic/linuxrc b/generic/linuxrc
index 434b8f981fc7cd7b736009149aaa5352dc392039..e22357f04964cbcfb1e9a16f9af53c31b7d540e9 100644 (file)
--- 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 af983bed90cf6bc5b7a358061456be15eddeeef3..c39c76a7020326a5e668f77e580ae7abc8f71322 100755 (executable)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 2b2cb3278e15ccf3d46d27374eb82b3002b7a7bb..d0721e65b3b07b35c9fb6b3e4b6c666718c2bd9e 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 259fae05ebff89078b93a2ce0a5fb9fd2d72df86..eec7edf64de9c6f7e70c7d6500c28b1fa1ffd2e6 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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 0beef539bdf75625b0c3f4cd2cf91fe8b1ad420a..39fb6a0fc672b5e0c06f981d7cca018f437a6895 100644 (file)
--- 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