Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/06/05 13:27:55+02:00 uni-frankfurt.de!mickeyl
make ipkg run later (S98 instead of S35)

BKrev: 40c1af17BZzeE2XK4KcV5n4mN5gOvA

diff --git a/base-files/base-files/etc/profile b/base-files/base-files/etc/profile
index a3932c9..2e28fc7 100644 (file)
--- a/base-files/base-files/etc/profile
+++ b/base-files/base-files/etc/profile
@@ -6,16 +6,12 @@ QPEDIR=/opt/QtPalmtop
 QTDIR=/opt/QtPalmtop
 PATH="/opt/QtPalmtop/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games"
 
+if [ "`id -u`" -eq 0 ]; then
+   PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin:
+fi
 if [ "$PS1" ]; then
-  if [ "$BASH" ]; then
-    PS1='\u@\h:\w\$ '
-  else
-    if [ "`id -u`" -eq 0 ]; then
-      PS1='# '
-    else
-      PS1='$ '
-    fi
-  fi
+# works for bash and ash (no other shells known to be in use here)
+   PS1='\u@\h:\w\$ '
 fi
 
 export PATH PS1 OPIEDIR QPEDIR QTDIR

diff --git a/base-files/base-files/share/dot.profile b/base-files/base-files/share/dot.profile
index e69de29..979793e 100644 (file)
--- a/base-files/base-files/share/dot.profile
+++ b/base-files/base-files/share/dot.profile
@@ -0,0 +1,10 @@
+# ~/.profile: executed by Bourne-compatible login shells.
+
+if [ -f ~/.bashrc ]; then
+  . ~/.bashrc
+fi
+
+# path set by /etc/profile
+# export PATH
+
+mesg n

diff --git a/ipkg/ipkg_0.99.121.oe b/ipkg/ipkg_0.99.121.oe
index f6204d1..dee970d 100644 (file)
--- a/ipkg/ipkg_0.99.121.oe
+++ b/ipkg/ipkg_0.99.121.oe
@@ -19,9 +19,8 @@ pkg_postinst_ipkg () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
        install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-       # this needs to happen after S35mountall so that /tmp is available
-       echo -e "#!/bin/sh\nipkg-cl configure\nrm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S36configure
-       chmod 755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S36configure
+       echo -e "#!/bin/sh\nipkg-cl configure\nrm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+       chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
 update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100

diff --git a/ipkg/ipkg_0.99.124.oe b/ipkg/ipkg_0.99.124.oe
index f6204d1..8e57a66 100644 (file)
--- a/ipkg/ipkg_0.99.124.oe
+++ b/ipkg/ipkg_0.99.124.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "Itsy Package Manager"
 DESCRIPTION_libipkg = "Itsy Package Manager Library"
 LICENSE = "GPL"
 PROVIDES = "virtual/ipkg libipkg"
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "libipkg-dev libipkg "
 FILES_libipkg-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so"
@@ -19,9 +19,9 @@ pkg_postinst_ipkg () {
 #!/bin/sh
 if [ "x$D" != "x" ]; then
        install -d ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d
-       # this needs to happen after S35mountall so that /tmp is available
-       echo -e "#!/bin/sh\nipkg-cl configure\nrm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S36configure
-       chmod 755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S36configure
+       # this happens at S98 where our good 'ole packages script used to run
+       echo -e "#!/bin/sh\nipkg-cl configure\nrm -f \$0" > ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
+       chmod 0755 ${IMAGE_ROOTFS}/${sysconfdir}/rcS.d/S98configure
 fi
 
 update-alternatives --install /usr/bin/ipkg ipkg /usr/bin/ipkg-cl 100