From 30618827202bc400d23e3421a60af56ca6de8e5e Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 27 Dec 2006 17:21:08 +0000 Subject: [PATCH] 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 --- ChangeLog | 9 +++++++++ alpha/busy-config | 4 ++-- gen_compile.sh | 12 ++++++++++- generic/keymaps.tar.gz | Bin 14070 -> 0 bytes generic/linuxrc | 44 +---------------------------------------- genkernel | 2 +- ia64/busy-config | 4 ++-- mips/busy-config | 2 +- parisc/busy-config | 4 ++-- parisc64/busy-config | 4 ++-- ppc/busy-config | 4 ++-- ppc64/busy-config | 4 ++-- sparc/busy-config | 4 ++-- sparc64/busy-config | 4 ++-- um/busy-config | 3 ++- x86/busy-config | 4 ++-- x86_64/busy-config | 4 ++-- xen0/busy-config | 4 ++-- xenU/busy-config | 4 ++-- 19 files changed, 49 insertions(+), 71 deletions(-) delete mode 100644 generic/keymaps.tar.gz 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 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 gen_initrd.sh, generic/linuxrc, genkernel: Added patches from François-Xavier Roure 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 d34098372b00ad738494f4cd07ac75bf3829bb9a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14070 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 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 -- 2.26.2