Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/07 19:13:04+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into cwiiisdesktop.(none):/home/cwiiis/oe/openembedded

2005/01/07 19:12:40+00:00 (none)!cwiiis
Add new package 'unionroot' that allows for a unionfs root.

2005/01/07 20:01:34+01:00 dyndns.org!reenoo
mplayer_1.0pre6: add --disable-live to EXTRA_OECONF

BKrev: 41dee597jCPPlI-5Tq42er9Euwaj7w

diff --git a/packages/mplayer/mplayer_1.0pre6.bb b/packages/mplayer/mplayer_1.0pre6.bb
index f51a265..15b6305 100644 (file)
--- a/packages/mplayer/mplayer_1.0pre6.bb
+++ b/packages/mplayer/mplayer_1.0pre6.bb
@@ -54,6 +54,7 @@ EXTRA_OECONF = " \
         --disable-tv-v4l2 \
         --disable-tv-bsdbt848 \
         --disable-mencoder \
+       --disable-live \
         \
         --enable-dynamic-plugins \
         --enable-fbdev \

diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb
index 8955e58..c69167b 100644 (file)
--- a/packages/sysvinit/sysvinit_2.86.bb
+++ b/packages/sysvinit/sysvinit_2.86.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
 
 FILES_${PN} += "/sbin /bin"
-PR = "r2"
+PR = "r3"
 
 # USE_VT and SERIAL_CONSLE are generally defined by the MACHINE .conf.
 # Set PACKAGE_ARCH appropriately.
@@ -72,6 +72,7 @@ EOF
                install -d ${D}/etc/rc$level.d
                ln -s ../init.d/stop-bootlogd ${D}/etc/rc$level.d/S99stop-bootlogd
        done
+       mv                 ${D}/sbin/init               ${D}/sbin/init.sysvinit
 }
 
 
@@ -86,6 +87,14 @@ v1:2345:respawn:/sbin/getty -L 115200 vc/1
 EOF
 }
 
+pkg_postinstall_sysvinit () {
+       update-alternatives --install /sbin/init init /sbin/init.sysvinit 50
+}
+
+pkg_postrm_sysvinit () {
+        update-alternatives --remove init /sbin/init.sysvinit
+}
+
 PACKAGES =+ "sysvinit-pidof sysvinit-sulogin"
 FILES_sysvinit-pidof = "/bin/pidof"
 FILES_sysvinit-sulogin = "/sbin/sulogin"

diff --git a/packages/unionfs/unionroot/init.unionroot b/packages/unionfs/unionroot/init.unionroot
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/unionfs/unionroot_0.1.bb b/packages/unionfs/unionroot_0.1.bb
new file mode 100644 (file)
index 0000000..e69de29