aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntonio Ospite <ospite@studenti.unina.it>2010-04-26 05:36:34 +0000
committerKoen Kooi <koen@openembedded.org>2010-04-28 18:24:39 +0200
commit79ec64232942ceec65237ed708b79c2f2ced6d67 (patch)
treeaa07792f549f99ecb991f5d9257aed5db8ccade5
parentd7c99b1010c3b1c6af9ac63c5a4b57e61f420d2e (diff)
downloadopenembedded-79ec64232942ceec65237ed708b79c2f2ced6d67.tar.gz
openembedded-79ec64232942ceec65237ed708b79c2f2ced6d67.tar.bz2
openembedded-79ec64232942ceec65237ed708b79c2f2ced6d67.zip
image.bbclass: create /etc/device_table from IMAGE_DEVICE_TABLES
Right now when the 'devices' script from initscripts is called the layout specified in IMAGE_DEVICES_TABLES is lost. With this change the default behaviour when no IMAGE_DEVICE_TABLES is specified is to always use files/device_table-minimal.txt Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--classes/image.bbclass4
-rw-r--r--recipes/initscripts/initscripts_1.0.bb4
2 files changed, 7 insertions, 1 deletions
diff --git a/classes/image.bbclass b/classes/image.bbclass
index 8e202f0665..0fcbc44051 100644
--- a/classes/image.bbclass
+++ b/classes/image.bbclass
@@ -119,8 +119,12 @@ fakeroot do_rootfs () {
mkdir -p ${IMAGE_ROOTFS}
mkdir -p ${DEPLOY_DIR_IMAGE}
+ mkdir -p ${IMAGE_ROOTFS}/etc
+
if [ "${USE_DEVFS}" != "1" ]; then
+ rm -rf ${IMAGE_ROOTFS}/etc/device_table
for devtable in ${@get_devtable_list(d)}; do
+ cat $devtable >> ${IMAGE_ROOTFS}/etc/device_table
makedevs -r ${IMAGE_ROOTFS} -D $devtable
done
fi
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 2c0689ffc8..43cf347349 100644
--- a/recipes/initscripts/initscripts_1.0.bb
+++ b/recipes/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r117"
+PR = "r118"
SRC_URI = "file://functions \
file://halt \
@@ -35,6 +35,8 @@ SRC_URI = "file://functions \
SRC_URI_append_arm = " file://alignment.sh"
+CONFFILES_${PN} += "${sysconfdir}/device_table"
+
KERNEL_VERSION = ""
do_install () {