diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-03-29 16:40:11 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-03-29 16:40:11 +0000 |
commit | 42a7f95b4f9de2b39818bed045ba5abed3b3d192 (patch) | |
tree | 7382805766bdab804491ec66d3b63eae3e29963f /sys-kernel/dracut/files | |
parent | Version bump: needed for >=hardened-sources-2.6.32-r43 and 2.6.38 (diff) | |
download | historical-42a7f95b4f9de2b39818bed045ba5abed3b3d192.tar.gz historical-42a7f95b4f9de2b39818bed045ba5abed3b3d192.tar.bz2 historical-42a7f95b4f9de2b39818bed045ba5abed3b3d192.zip |
sys-kernel/dracut: Removed patches of not existing ebuilds.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/dracut/files')
10 files changed, 0 insertions, 422 deletions
diff --git a/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch b/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch deleted file mode 100644 index 1b51e3b1de71..000000000000 --- a/sys-kernel/dracut/files/dracut-002-add-missing-functions.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 5e5ec023bedc14d709f1d5f8e2803ba171b05daa Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 18 Sep 2009 09:08:23 +0200 -Subject: [PATCH] dracut-gencmdline: add missing functions - ---- - dracut-gencmdline | 33 +++++++++++++++++++++++++++++++++ - 1 files changed, 33 insertions(+), 0 deletions(-) - -diff --git a/dracut-gencmdline b/dracut-gencmdline -index bab102f..f3cbee1 100755 ---- a/dracut-gencmdline -+++ b/dracut-gencmdline -@@ -19,6 +19,39 @@ - # - #. /usr/libexec/initrd-functions - -+IF_verbose="" -+function set_verbose() { -+ case $1 in -+ 1|true|yes|on) -+ IF_verbose="-v" -+ ;; -+ 0|false|no|off) -+ IF_verbose="" -+ ;; -+ esac -+} -+ -+function is_verbose() { -+ [ -n "$IF_verbose" ] && return 0 -+ return 1 -+} -+ -+function get_verbose() { -+ echo "$IF_verbose" -+ is_verbose -+} -+ -+ -+function get_numeric_dev() { -+( -+ fmt="%d:%d" -+ if [ "$1" == "hex" ]; then -+ fmt="%x:%x" -+ fi -+ ls -lH "$2" | awk '{ sub(/,/, "", $5); printf("'"$fmt"'", $5, $6); }' -+) 2>/dev/null -+} -+ - - function error() { - echo "$@" >&2 --- -1.6.3.3 - diff --git a/sys-kernel/dracut/files/dracut-002-custom-paths.patch b/sys-kernel/dracut/files/dracut-002-custom-paths.patch deleted file mode 100644 index d21cc0ed703a..000000000000 --- a/sys-kernel/dracut/files/dracut-002-custom-paths.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 550fa5f9ae8c6b2fa284d78c090edc5a36991d3a Mon Sep 17 00:00:00 2001 -From: Lance Albertson <lance@osuosl.org> -Date: Sat, 26 Sep 2009 21:26:43 -0700 -Subject: [PATCH 2/3] custom paths - ---- - Makefile | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index d9ce0f8..f6d162f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,12 +1,12 @@ - VERSION=002 - GITVERSION=$(shell [ -d .git ] && git rev-list --abbrev-commit -n 1 HEAD |cut -b 1-8) - --prefix = /usr --datadir = ${prefix}/share --pkglibdir = ${datadir}/dracut --sysconfdir = ${prefix}/etc --sbindir = ${prefix}/sbin --mandir = ${prefix}/share/man -+prefix ?= /usr -+datadir ?= ${prefix}/share -+pkglibdir ?= ${datadir}/dracut -+sysconfdir ?= ${prefix}/etc -+sbindir ?= ${prefix}/sbin -+mandir ?= ${prefix}/share/man - - modules.d/99base/switch_root: switch_root.c - gcc -D _GNU_SOURCE -D 'PACKAGE_STRING="dracut"' -std=gnu99 -fsigned-char -g -O2 -o modules.d/99base/switch_root switch_root.c --- -1.6.3.3 - diff --git a/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch b/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch deleted file mode 100644 index 9106e3719259..000000000000 --- a/sys-kernel/dracut/files/dracut-002-dir-symlinks.patch +++ /dev/null @@ -1,102 +0,0 @@ -From 044fbc9ed51e4df819ee5710ed519c566579ff59 Mon Sep 17 00:00:00 2001 -From: Lance Albertson <lance@osuosl.org> -Date: Sat, 26 Sep 2009 21:33:41 -0700 -Subject: [PATCH 3/3] dir symlinks - ---- - dracut | 2 +- - dracut-functions | 43 +++++++++++++++++++++++++++++++++++++------ - 2 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/dracut b/dracut -index b96ad5e..0518969 100755 ---- a/dracut -+++ b/dracut -@@ -174,7 +174,7 @@ export initdir hookdirs dsrc dracutmodules drivers \ - if [[ $kernel_only != yes ]]; then - # Create some directory structure first - for d in bin sbin usr/bin usr/sbin usr/lib etc proc sys sysroot tmp dev/pts var/run; do -- mkdir -p "$initdir/$d"; -+ inst_dir "/$d"; - done - fi - -diff --git a/dracut-functions b/dracut-functions -index 2abd6f2..1f2d1e6 100755 ---- a/dracut-functions -+++ b/dracut-functions -@@ -131,6 +131,36 @@ check_vol_slaves() { - return 1 - } - -+# Install a directory, keeping symlinks as on the original system. -+# Example: if /lib64 points to /lib on the host, "inst_dir /lib/file" -+# will create ${initdir}/lib64, ${initdir}/lib64/file, -+# and a symlink ${initdir}/lib -> lib64. -+inst_dir() { -+ local dir="$1" -+ [[ -e "${initdir}$dir" ]] && return 0 -+ -+ # iterate over parent directories -+ local file="" -+ local IFS="/" -+ for part in $dir; do -+ [ -z "$part" ] && continue -+ file="$file/$part" -+ [[ -e "${initdir}$file" ]] && continue -+ -+ if [ -L "$file" ]; then -+ # create link as the original -+ local target=$(readlink "$file") -+ ln -sfn "$target" "${initdir}$file" || return 1 -+ # resolve relative path and recursively install destionation -+ [[ "$target" = "${target##*/}" ]] && target="${file%/*}/$target" -+ inst_dir "$target" -+ else -+ # create directory -+ mkdir -p "${initdir}$file" || return 1 -+ fi -+ done -+} -+ - # $1 = file to copy to ramdisk - # $2 (optional) Name for the file on the ramdisk - # Location of the image dir is assumed to be $initdir -@@ -138,11 +168,11 @@ check_vol_slaves() { - inst_simple() { - local src target - [[ -f $1 ]] || return 1 -- src=$1 target=${initdir}${2:-$1} -- [[ -f $target ]] && return 0 -- mkdir -p "${target%/*}" -+ src=$1 target="${2:-$1}" -+ [[ -f ${initdir}$target ]] && return 0 -+ inst_dir "${target%/*}" - dinfo "Installing $src" -- cp -pfL "$src" "$target" -+ cp -fL "$src" "${initdir}$target" - } - - # Same as above, but specialzed to handle dynamic libraries. -@@ -155,7 +185,7 @@ inst_library() { - reallib=$(readlink -f "$src") - lib=${src##*/} - inst_simple "$reallib" "$reallib" -- mkdir -p "${initdir}${dest%/*}" -+ inst_dir "${dest%/*}" - (cd "${initdir}${dest%/*}" && ln -s "$reallib" "$lib") - else - inst_simple "$src" "$dest" -@@ -250,7 +280,8 @@ find_rule() { - # create a function to install them to make life simpler. - inst_rules() { - local target=/etc/udev/rules.d -- mkdir -p "$initdir/lib/udev/rules.d" "$initdir$target" -+ inst_dir "/lib/udev/rules.d" -+ inst_dir "$target" - for rule in "$@"; do - rule=$(find_rule "$rule") && \ - inst_simple "$rule" "$target/${rule##*/}" --- -1.6.3.3 - diff --git a/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch b/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch deleted file mode 100644 index 1497b2d73d11..000000000000 --- a/sys-kernel/dracut/files/dracut-002-gencmdline-check-for-keyboard-i18n-files.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6dc6649052d07a6ab0720bd4e866629cb385cb8a Mon Sep 17 00:00:00 2001 -From: Lance Albertson <lance@osuosl.org> -Date: Mon, 28 Sep 2009 20:30:17 -0700 -Subject: [PATCH] dracut-gencmdline: check for keyboard & i18n files - ---- - dracut-gencmdline | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dracut-gencmdline b/dracut-gencmdline -index f3cbee1..0f2bca1 100755 ---- a/dracut-gencmdline -+++ b/dracut-gencmdline -@@ -689,8 +689,8 @@ for cryptdev in ${!cryptolv@} ; do - done - - # output local keyboard/18n settings --. /etc/sysconfig/keyboard --. /etc/sysconfig/i18n -+[ -e /etc/sysconfig/keyboard ] && . /etc/sysconfig/keyboard -+[ -e /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n - - for i in KEYTABLE SYSFONT SYSFONTACM UNIMAP LANG; do - val=$(eval echo \$$i) --- -1.6.3.3 - diff --git a/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch b/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch deleted file mode 100644 index 01a30fb774a2..000000000000 --- a/sys-kernel/dracut/files/dracut-002-makefile-add-with_switch_root.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b3611b52578dcab5fca78f26ba37406b352a1419 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Mon, 23 Nov 2009 11:59:58 +0100 -Subject: Makefile: add WITH_SWITCH_ROOT - ---- - Makefile | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -diff --git a/Makefile b/Makefile -index f6d162f..34cdc65 100644 ---- a/Makefile -+++ b/Makefile -@@ -11,7 +11,13 @@ mandir ?= ${prefix}/share/man - modules.d/99base/switch_root: switch_root.c - gcc -D _GNU_SOURCE -D 'PACKAGE_STRING="dracut"' -std=gnu99 -fsigned-char -g -O2 -o modules.d/99base/switch_root switch_root.c - --all: modules.d/99base/switch_root -+ifeq (1,${WITH_SWITCH_ROOT}) -+targets = modules.d/99base/switch_root -+else -+targets = -+endif -+ -+all: $(targets) - - .PHONY: install clean archive rpm testimage test all check - -@@ -24,12 +30,16 @@ install: - install -m 0755 dracut $(DESTDIR)$(sbindir)/dracut - install -m 0755 dracut-gencmdline $(DESTDIR)$(sbindir)/dracut-gencmdline - install -m 0755 dracut-catimages $(DESTDIR)$(sbindir)/dracut-catimages -+ifeq (1,${WITH_SWITCH_ROOT}) - install -m 0755 modules.d/99base/switch_root $(DESTDIR)$(sbindir)/switch_root -+endif - install -m 0644 dracut.conf $(DESTDIR)$(sysconfdir)/dracut.conf - install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions - cp -arx modules.d $(DESTDIR)$(pkglibdir) - install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8 -+ifeq (1,${WITH_SWITCH_ROOT}) - rm $(DESTDIR)$(pkglibdir)/modules.d/99base/switch_root -+endif - - clean: - rm -f *~ --- -1.6.2.5 - diff --git a/sys-kernel/dracut/files/dracut-002-unmount.patch b/sys-kernel/dracut/files/dracut-002-unmount.patch deleted file mode 100644 index 1914b2310f2b..000000000000 --- a/sys-kernel/dracut/files/dracut-002-unmount.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7aa5f85a748dcad3567c878b8623af446f0d8c4f Mon Sep 17 00:00:00 2001 -From: Lance Albertson <lance@osuosl.org> -Date: Sat, 26 Sep 2009 21:26:06 -0700 -Subject: [PATCH 1/3] fix umount - ---- - switch_root.c | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/switch_root.c b/switch_root.c -index 8ce4aaf..1643a71 100644 ---- a/switch_root.c -+++ b/switch_root.c -@@ -160,22 +160,15 @@ done: - static int switchroot(const char *newroot) - { - /* Don't try to unmount the old "/", there's no way to do it. */ -- const char *umounts[] = { "/dev", "/proc", "/sys", NULL }; -+ const char *umounts[] = { "/dev/pts", "/dev", "/proc", "/sys", NULL }; - char *newroot_mnt; - const char *chroot_path = NULL; - int i; - int r = -1; - - for (i = 0; umounts[i] != NULL; i++) { -- char newmount[PATH_MAX]; -- -- snprintf(newmount, sizeof(newmount), "%s%s", newroot, umounts[i]); -- -- if (mount(umounts[i], newmount, NULL, MS_MOVE, NULL) < 0) { -- warn("failed to mount moving %s to %s", -- umounts[i], newmount); -- warnx("forcing unmount of %s", umounts[i]); -- umount2(umounts[i], MNT_FORCE); -+ if (umount2(umounts[i], MNT_FORCE) < 0) { -+ warn("failed to unmount %s", umounts[i]); - } - } - --- -1.6.3.3 - diff --git a/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch b/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch deleted file mode 100644 index c7221cb42b50..000000000000 --- a/sys-kernel/dracut/files/dracut-006-console_init-not-necessary.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9d6ec99daf852a429262c46639558823bf937eab Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sat, 10 Jul 2010 22:54:59 +0200 -Subject: [PATCH] 50plymouth: calling console_init isn't necessary - ---- - modules.d/50plymouth/plymouth-pretrigger.sh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh -index 8605c61..6bf7f2a 100755 ---- a/modules.d/50plymouth/plymouth-pretrigger.sh -+++ b/modules.d/50plymouth/plymouth-pretrigger.sh -@@ -15,7 +15,8 @@ if ! getarg rd_NO_PLYMOUTH; then - - info "Starting plymouth daemon" - [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session -- /lib/udev/console_init tty0 -+ # Workaround for 006. To be restored in next release. -+ #/lib/udev/console_init tty0 - /bin/plymouth --show-splash 2>&1 | vinfo - fi - --- -1.7.1 - diff --git a/sys-kernel/dracut/files/dracut-006-dhcp6.patch b/sys-kernel/dracut/files/dracut-006-dhcp6.patch deleted file mode 100644 index 930dcae092ba..000000000000 --- a/sys-kernel/dracut/files/dracut-006-dhcp6.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh -index 7362669..a3c9597 100755 ---- a/modules.d/40network/parse-ip-opts.sh -+++ b/modules.d/40network/parse-ip-opts.sh -@@ -74,7 +74,7 @@ for p in $(getargs ip=); do - die "Sorry, automatic calculation of netmask is not yet supported" - ;; - auto6);; -- dhcp|on|any) \ -+ dhcp|dhcp6|on|any) \ - [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \ - die "Sorry, 'ip=$p' does not make sense for multiple interface configurations" - [ -n "$ip" ] && \ diff --git a/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch deleted file mode 100644 index 5924fdeee1b8..000000000000 --- a/sys-kernel/dracut/files/dracut-006-dm-udev-rules.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4cd3f9d7e4b8da2cfd5c8b5c4126fe6bd867d56e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sun, 4 Jul 2010 21:21:29 +0200 -Subject: [PATCH 16/41] dm, dmraid, lvm: install udev rules file 64-device-mapper.rules - -Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install rules: - 10-dm.rules - 11-dm-lvm.rules - 13-dm-disk.rules - 95-dm-notify.rules -but provides only 64-device-mapper.rules combining more or less the -above rules files. ---- - modules.d/90dm/install | 3 +++ - modules.d/90dmraid/install | 3 +++ - modules.d/90lvm/install | 3 +++ - 3 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/modules.d/90dm/install b/modules.d/90dm/install -index f77d945..0bc9ced 100755 ---- a/modules.d/90dm/install -+++ b/modules.d/90dm/install -@@ -7,3 +7,6 @@ inst dmsetup - - inst dmeventd - inst_rules 10-dm.rules 95-dm-notify.rules -+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules -+# files, but provides the one below: -+inst_rules 64-device-mapper.rules -diff --git a/modules.d/90dmraid/install b/modules.d/90dmraid/install -index a016e4d..81c63f0 100755 ---- a/modules.d/90dmraid/install -+++ b/modules.d/90dmraid/install -@@ -15,6 +15,9 @@ done - - - inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules -+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules -+# files, but provides the one below: -+inst_rules 64-device-mapper.rules - - inst "$moddir/dmraid.sh" /sbin/dmraid_scan - -diff --git a/modules.d/90lvm/install b/modules.d/90lvm/install -index 0813486..a189a20 100755 ---- a/modules.d/90lvm/install -+++ b/modules.d/90lvm/install -@@ -13,6 +13,9 @@ if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then - fi - - inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules -+# Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules -+# files, but provides the one below: -+inst_rules 64-device-mapper.rules - - inst "$moddir/lvm_scan.sh" /sbin/lvm_scan - inst_hook cmdline 30 "$moddir/parse-lvm.sh" --- -1.7.1 - diff --git a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch deleted file mode 100644 index 4b13fb2367ae..000000000000 --- a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/dracut-functions b/dracut-functions -index 58f119f..2cd573a 100755 ---- a/dracut-functions -+++ b/dracut-functions -@@ -248,7 +248,7 @@ inst_binary() { - local LDSO NAME IO FILE ADDR I1 n f TLIBDIR - [[ -e $initdir$target ]] && return 0 - # I love bash! -- ldd $bin 2>/dev/null | while read line; do -+ LC_ALL=C ldd $bin 2>/dev/null | while read line; do - [[ $line = 'not a dynamic executable' ]] && return 1 - if [[ $line =~ not\ found ]]; then - derror "Missing a shared library required by $bin." |