From: Grazvydas Ignotas <notasas@gmail.com>
Date: Tue, 17 Dec 2013 23:14:27 +0000 (+0200)
Subject: pandora images: trying to work around some breakage
X-Git-Tag: sz_160~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ec533362e56ec649ba8522a0c4fd02b7917d20d;p=openpandora.oe.git

pandora images: trying to work around some breakage

sysvinit file override no longer installs sysvinit-* packages?
---

diff --git a/recipes/images/pandora-xfce-image-nowifi.bb b/recipes/images/pandora-xfce-image-nowifi.bb
index 9aeca37..181eb67 100755
--- a/recipes/images/pandora-xfce-image-nowifi.bb
+++ b/recipes/images/pandora-xfce-image-nowifi.bb
@@ -6,7 +6,7 @@ IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
 inherit image
 
-PR = "r5"
+PR = "r6"
 
 export IMAGE_BASENAME = "pandora-xfce-image-nowifi"
 
@@ -25,9 +25,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 # reminder: /etc/op-version is now made by recipes/pandora-system/pandora-version.bb
 
 # HACK for different serial ports used by different kernels
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a S0:2345:once:/sbin/getty 115200 ttyS0' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a O2:2345:once:/sbin/getty 115200 ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS2/a ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/securetty;"
 
 # call a script to generate flashes tools automatically
diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 87890c6..0bb6fc6 100755
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -6,7 +6,7 @@ IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
 inherit image
 
-PR = "r32"
+PR = "r33"
 
 export IMAGE_BASENAME = "pandora-xfce-image"
 
@@ -25,9 +25,6 @@ IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 # reminder: /etc/op-version is now made by recipes/pandora-system/pandora-version.bb
 
 # HACK for different serial ports used by different kernels
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a S0:2345:once:/sbin/getty 115200 ttyS0' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
-ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a O2:2345:once:/sbin/getty 115200 ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS2/a ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/securetty;"
 
 # call a script to generate flashes tools automatically
diff --git a/recipes/tasks/task-pandora-core.bb b/recipes/tasks/task-pandora-core.bb
index 0494f6b..96004db 100755
--- a/recipes/tasks/task-pandora-core.bb
+++ b/recipes/tasks/task-pandora-core.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Task file for default core/console apps and libs in the Pandora i
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r41"
+PR = "r42"
 
 inherit task 
 
@@ -123,10 +123,20 @@ UTIL_LINUX_NG_EXTRAS = " \
   util-linux-ng-losetup util-linux-ng-mountall \
   util-linux-ng-swaponoff \
 "
-  
+
+# sysvinit-* used to not be needed, but after adding
+# recipes/sysvinit/sysvinit/omap3-pandora/*
+# they are no longer included automatically?
+SYSVINIT = " \
+  sysvinit-inittab \
+  sysvinit-sulogin \
+  sysvinit-utils \
+"
+
 RDEPENDS_${PN} = "\
   task-base-extended \
   task-proper-tools \
+  ${SYSVINIT} \
   ${AUFS} \
   ${BOOST} \
   ${WIRELESS} \