From 79d29bb56538f082fd3e29a917c9d557880149b7 Mon Sep 17 00:00:00 2001 From: Dirk von Suchodoletz Date: Sat, 31 Jan 2009 14:48:32 +0000 Subject: Moved (n)curses stuff to preboot uclib-rootfs layer, see PreBoot wiki entry. git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2558 95ad53e4-c205-0410-b2fa-d234c58c8868 --- boot-env/preboot/uclib-rootfs/libcurses.so | 1 + boot-env/preboot/uclib-rootfs/libncurses.so | 1 + boot-env/preboot/uclib-rootfs/libncurses.so.5 | 1 + boot-env/preboot/uclib-rootfs/libncurses.so.5.6 | Bin 0 -> 229164 bytes boot-env/preboot/uclib-rootfs/usr/bin/dialog | Bin 0 -> 104468 bytes boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so | 10 ++++++++++ boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so | 10 ++++++++++ initramfs/uclib-rootfs/etc/env.d/50ncurses | 1 - initramfs/uclib-rootfs/lib/libcurses.so | 1 - initramfs/uclib-rootfs/lib/libncurses.so | 1 - initramfs/uclib-rootfs/lib/libncurses.so.5 | 1 - initramfs/uclib-rootfs/lib/libncurses.so.5.6 | Bin 229164 -> 0 bytes initramfs/uclib-rootfs/usr/bin/dialog | Bin 104468 -> 0 bytes initramfs/uclib-rootfs/usr/lib/libcurses.so | 10 ---------- initramfs/uclib-rootfs/usr/lib/libncurses.so | 10 ---------- 15 files changed, 23 insertions(+), 24 deletions(-) create mode 120000 boot-env/preboot/uclib-rootfs/libcurses.so create mode 120000 boot-env/preboot/uclib-rootfs/libncurses.so create mode 120000 boot-env/preboot/uclib-rootfs/libncurses.so.5 create mode 100755 boot-env/preboot/uclib-rootfs/libncurses.so.5.6 create mode 100755 boot-env/preboot/uclib-rootfs/usr/bin/dialog create mode 100755 boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so create mode 100755 boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so delete mode 100644 initramfs/uclib-rootfs/etc/env.d/50ncurses delete mode 120000 initramfs/uclib-rootfs/lib/libcurses.so delete mode 120000 initramfs/uclib-rootfs/lib/libncurses.so delete mode 120000 initramfs/uclib-rootfs/lib/libncurses.so.5 delete mode 100755 initramfs/uclib-rootfs/lib/libncurses.so.5.6 delete mode 100755 initramfs/uclib-rootfs/usr/bin/dialog delete mode 100755 initramfs/uclib-rootfs/usr/lib/libcurses.so delete mode 100755 initramfs/uclib-rootfs/usr/lib/libncurses.so diff --git a/boot-env/preboot/uclib-rootfs/libcurses.so b/boot-env/preboot/uclib-rootfs/libcurses.so new file mode 120000 index 00000000..c7b1e02a --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/libcurses.so @@ -0,0 +1 @@ +libncurses.so.5.6 \ No newline at end of file diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so b/boot-env/preboot/uclib-rootfs/libncurses.so new file mode 120000 index 00000000..7257b6af --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/libncurses.so @@ -0,0 +1 @@ +libncurses.so.5 \ No newline at end of file diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so.5 b/boot-env/preboot/uclib-rootfs/libncurses.so.5 new file mode 120000 index 00000000..c7b1e02a --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/libncurses.so.5 @@ -0,0 +1 @@ +libncurses.so.5.6 \ No newline at end of file diff --git a/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 b/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 new file mode 100755 index 00000000..00a18be2 Binary files /dev/null and b/boot-env/preboot/uclib-rootfs/libncurses.so.5.6 differ diff --git a/boot-env/preboot/uclib-rootfs/usr/bin/dialog b/boot-env/preboot/uclib-rootfs/usr/bin/dialog new file mode 100755 index 00000000..2d991b31 Binary files /dev/null and b/boot-env/preboot/uclib-rootfs/usr/bin/dialog differ diff --git a/boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so b/boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so new file mode 100755 index 00000000..6126685c --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/usr/lib/libcurses.so @@ -0,0 +1,10 @@ +/* GNU ld script + Since Gentoo has critical dynamic libraries + in /lib, and the static versions in /usr/lib, + we need to have a "fake" dynamic lib in /usr/lib, + otherwise we run into linking problems. + + See bug http://bugs.gentoo.org/4411 for more info. + */ +OUTPUT_FORMAT ( elf32-i386 ) +GROUP ( /lib/libcurses.so ) diff --git a/boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so b/boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so new file mode 100755 index 00000000..6d4cb861 --- /dev/null +++ b/boot-env/preboot/uclib-rootfs/usr/lib/libncurses.so @@ -0,0 +1,10 @@ +/* GNU ld script + Since Gentoo has critical dynamic libraries + in /lib, and the static versions in /usr/lib, + we need to have a "fake" dynamic lib in /usr/lib, + otherwise we run into linking problems. + + See bug http://bugs.gentoo.org/4411 for more info. + */ +OUTPUT_FORMAT ( elf32-i386 ) +GROUP ( /lib/libncurses.so ) diff --git a/initramfs/uclib-rootfs/etc/env.d/50ncurses b/initramfs/uclib-rootfs/etc/env.d/50ncurses deleted file mode 100644 index 495f2ccd..00000000 --- a/initramfs/uclib-rootfs/etc/env.d/50ncurses +++ /dev/null @@ -1 +0,0 @@ -CONFIG_PROTECT_MASK="/etc/terminfo" diff --git a/initramfs/uclib-rootfs/lib/libcurses.so b/initramfs/uclib-rootfs/lib/libcurses.so deleted file mode 120000 index c7b1e02a..00000000 --- a/initramfs/uclib-rootfs/lib/libcurses.so +++ /dev/null @@ -1 +0,0 @@ -libncurses.so.5.6 \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libncurses.so b/initramfs/uclib-rootfs/lib/libncurses.so deleted file mode 120000 index 7257b6af..00000000 --- a/initramfs/uclib-rootfs/lib/libncurses.so +++ /dev/null @@ -1 +0,0 @@ -libncurses.so.5 \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libncurses.so.5 b/initramfs/uclib-rootfs/lib/libncurses.so.5 deleted file mode 120000 index c7b1e02a..00000000 --- a/initramfs/uclib-rootfs/lib/libncurses.so.5 +++ /dev/null @@ -1 +0,0 @@ -libncurses.so.5.6 \ No newline at end of file diff --git a/initramfs/uclib-rootfs/lib/libncurses.so.5.6 b/initramfs/uclib-rootfs/lib/libncurses.so.5.6 deleted file mode 100755 index 00a18be2..00000000 Binary files a/initramfs/uclib-rootfs/lib/libncurses.so.5.6 and /dev/null differ diff --git a/initramfs/uclib-rootfs/usr/bin/dialog b/initramfs/uclib-rootfs/usr/bin/dialog deleted file mode 100755 index 2d991b31..00000000 Binary files a/initramfs/uclib-rootfs/usr/bin/dialog and /dev/null differ diff --git a/initramfs/uclib-rootfs/usr/lib/libcurses.so b/initramfs/uclib-rootfs/usr/lib/libcurses.so deleted file mode 100755 index 6126685c..00000000 --- a/initramfs/uclib-rootfs/usr/lib/libcurses.so +++ /dev/null @@ -1,10 +0,0 @@ -/* GNU ld script - Since Gentoo has critical dynamic libraries - in /lib, and the static versions in /usr/lib, - we need to have a "fake" dynamic lib in /usr/lib, - otherwise we run into linking problems. - - See bug http://bugs.gentoo.org/4411 for more info. - */ -OUTPUT_FORMAT ( elf32-i386 ) -GROUP ( /lib/libcurses.so ) diff --git a/initramfs/uclib-rootfs/usr/lib/libncurses.so b/initramfs/uclib-rootfs/usr/lib/libncurses.so deleted file mode 100755 index 6d4cb861..00000000 --- a/initramfs/uclib-rootfs/usr/lib/libncurses.so +++ /dev/null @@ -1,10 +0,0 @@ -/* GNU ld script - Since Gentoo has critical dynamic libraries - in /lib, and the static versions in /usr/lib, - we need to have a "fake" dynamic lib in /usr/lib, - otherwise we run into linking problems. - - See bug http://bugs.gentoo.org/4411 for more info. - */ -OUTPUT_FORMAT ( elf32-i386 ) -GROUP ( /lib/libncurses.so ) -- cgit v1.2.3-55-g7522