diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2004-06-05 11:31:35 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2004-06-05 11:31:35 +0000 |
| commit | 3a4356259928ada67e7fbd1cb4c5b89c7335ecdb (patch) | |
| tree | e19369579afffaa791040e26515f206c4f3a0dfd | |
| parent | bf5a6cc4503b774ae77f405eac1ce3ec77f438c8 (diff) | |
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
| -rw-r--r-- | base-files/base-files/etc/profile | 14 | ||||
| -rw-r--r-- | base-files/base-files/share/dot.profile | 10 | ||||
| -rw-r--r-- | ipkg/ipkg_0.99.121.oe | 5 | ||||
| -rw-r--r-- | ipkg/ipkg_0.99.124.oe | 8 |
4 files changed, 21 insertions, 16 deletions
diff --git a/base-files/base-files/etc/profile b/base-files/base-files/etc/profile index a3932c974a..2e28fc777b 100644 --- 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 e69de29bb2..979793e8b5 100644 --- 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 f6204d18d8..dee970df41 100644 --- 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 f6204d18d8..8e57a6684f 100644 --- 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 |