diff options
| -rw-r--r-- | glibc/glibc-2.3.2/etc/ld.so.conf | 3 | ||||
| -rw-r--r-- | glibc/glibc-cvs/etc/ld.so.conf | 3 | ||||
| -rw-r--r-- | initscripts/initscripts-1.0-r0/packages | 70 | ||||
| -rw-r--r-- | initscripts/initscripts_1.0.oe | 3 |
4 files changed, 6 insertions, 73 deletions
diff --git a/glibc/glibc-2.3.2/etc/ld.so.conf b/glibc/glibc-2.3.2/etc/ld.so.conf index e69de29bb2..3f9b41aabb 100644 --- a/glibc/glibc-2.3.2/etc/ld.so.conf +++ b/glibc/glibc-2.3.2/etc/ld.so.conf @@ -0,0 +1,3 @@ +/usr/local/lib +/opt/QtPalmtop/lib + diff --git a/glibc/glibc-cvs/etc/ld.so.conf b/glibc/glibc-cvs/etc/ld.so.conf index e69de29bb2..3f9b41aabb 100644 --- a/glibc/glibc-cvs/etc/ld.so.conf +++ b/glibc/glibc-cvs/etc/ld.so.conf @@ -0,0 +1,3 @@ +/usr/local/lib +/opt/QtPalmtop/lib + diff --git a/initscripts/initscripts-1.0-r0/packages b/initscripts/initscripts-1.0-r0/packages deleted file mode 100644 index 26263bde20..0000000000 --- a/initscripts/initscripts-1.0-r0/packages +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh -# Original author: ??? -# -# Additions by Steph Meslin-Weber: -# x Percentage display -# x Dot display of dependency installations -# - removed both of above -# - display is now X of Y packages and current package name being installed - -. /etc/default/rcS - -if [ -e /dev/tty0 ]; then - vtmaster=/dev/tty0 -elif [ -e /dev/vc/0 ]; then - vtmaster=/dev/vc/0 -else - vtmaster=/dev/null -fi - -# Display formatting -linelength=80 -head1=" Progress: " -head2=" Packages: " -disp1="\033[1A\033[${linelength}D\033[K${head1}" -disp2="\033[1B\033[${linelength}D\033[K${head2}" - -reconfigure () { - pkg=$1; - path=$2; - curposition=$3; - max=$4; - test -e "$path/info/$pkg.control" || return 1; - - echo >$vtmaster -ne "$disp1 \033[1m${curposition} of ${max}\033[0m packages" - echo >$vtmaster -ne "$disp2 ${pkg}..." - - test -e "$path/info/$pkg.prerm" && $path/info/$pkg.prerm unconfigure >/dev/null 2>&1 - test -e "$path/info/$pkg.postinst" && $path/info/$pkg.postinst configure >/dev/null 2>&1 - - log="$log $pkg"; - - return 0; -} - -if test ! -e /etc/.configured; then - test "$VERBOSE" != "no" && echo >$vtmaster "Starting at `date +%H:%M:%S`" - echo >$vtmaster -ne "\rReconfiguring all packages installed to root...\n\r\n\r"; - - # switch off console cursor - echo >$vtmaster -ne "\033[?25l" - - log=""; - - # number of root packages (not including dependencies) - maxcount=`ls -l /usr/lib/ipkg/info/*.control|wc -l|sed -e 's, ,,g'` - - curposition=0 - for control in /usr/lib/ipkg/info/*.control; do - package=`echo $control|sed -e 's,.*/,,g; s,\.control,,g;'` - (echo $log|grep -q $package) || reconfigure $package /usr/lib/ipkg "$curposition" "$maxcount"; - curposition=`expr $curposition + 1` - done - - echo >$vtmaster -ne "$disp1 \033[1m${maxcount} of ${maxcount}\033[0m packages" - echo >$vtmaster -ne "$disp2 Completed.\r\n" - test "$VERBOSE" != "no" && echo >$vtmaster "Finished at `date +%H:%M:%S`" - - # switch on console cursor - echo >$vtmaster -ne "\033[?25h" -fi diff --git a/initscripts/initscripts_1.0.oe b/initscripts/initscripts_1.0.oe index 53b4576a17..0f3066dd5a 100644 --- a/initscripts/initscripts_1.0.oe +++ b/initscripts/initscripts_1.0.oe @@ -27,7 +27,6 @@ SRC_URI = "file://halt \ file://simpad/banner \ file://single \ file://sendsigs \ - file://packages \ file://urandom \ file://rmnologin \ file://extractfs \ @@ -58,7 +57,6 @@ do_install () { install -m 0755 ${WORKDIR}/hostname.sh ${D}/etc/init.d install -m 0755 ${WORKDIR}/mountall.sh ${D}/etc/init.d install -m 0755 ${WORKDIR}/mountnfs.sh ${D}/etc/init.d - install -m 0755 ${WORKDIR}/packages ${D}/etc/init.d install -m 0755 ${WORKDIR}/reboot ${D}/etc/init.d install -m 0755 ${WORKDIR}/rmnologin ${D}/etc/init.d install -m 0755 ${WORKDIR}/sendsigs ${D}/etc/init.d @@ -101,7 +99,6 @@ do_install () { ln -sf ../init.d/mountnfs.sh ${D}/etc/rcS.d/S45mountnfs.sh ln -sf ../init.d/bootmisc.sh ${D}/etc/rcS.d/S55bootmisc.sh # ln -sf ../init.d/urandom ${D}/etc/rcS.d/S55urandom - ln -sf ../init.d/packages ${D}/etc/rcS.d/S98packages ln -sf ../init.d/finish ${D}/etc/rcS.d/S99finish ln -sf ../init.d/devices ${D}/etc/rcS.d/S01devices ln -sf ../init.d/sysfs.sh ${D}/etc/rcS.d/S36sysfs |