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 <[email protected]> --- Hi Koen et al., This looks to be enough in my preliminary tests. As for the default behaviour change, I guess it is acceptable and files/device_table-minimal.txt can always be changed in a later commit, maybe to resemble more the very /etc/device_table from initscripts. This patch fixes http://bugs.openembedded.org/show_bug.cgi?id=3593 and I consider it an orthogonal problem to having static /dev, so this can be reviewed alone. Note that I used /etc instead of ${sysconfdir} on purpose as /etc is already hardcoded in several places in image.bbclass. Thanks, Antonio Ospite http://ao2.it classes/image.bbclass | 4 ++++ recipes/initscripts/initscripts_1.0.bb | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/classes/image.bbclass b/classes/image.bbclass index 8e202f0..0fcbc44 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 2c0689f..43cf347 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 () { -- 1.7.0.5 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
