Skip to contentSkip to conversation

Minor changes

PATCH Applied Andrea Adami 2 participants 5 messages Jan 15, 2012 – Jan 16, 2012

lore
Share & tools
lore
#0 lore raw

cover Minor changes

* Standardize the initramfs-kexecboot images and adapt
* mimicking core-image-minimal-initramfs.
*
* Remove legacy device table for Zaurus, now using devtmpfs in kernel.

Andrea Adami (2):
initramfs-kexecboot-* images: adapt to oe-core zaurus.inc: remove IMAGE_DEVICETABLE settings, now using devtmpfs

 conf/machine/include/zaurus.inc                    |    5 -----
 recipes-bsp/images/initramfs-kexecboot-image.bb    |    5 +++++
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH 1/2 initramfs-kexecboot-* images: adapt to oe-core

* Set IMAGE_FEATURES = "" to prevent the setting of things
* like EXTRA_IMAGE_FEATURES in local.conf (from oe-core).
* Readd IMAGE_BASENAME like all other images are doing.

* Signed-off-by: Andrea Adami <[email protected]>

---
 recipes-bsp/images/initramfs-kexecboot-image.bb    |    5 +++++
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)
recipes-bsp/images/initramfs-kexecboot-image.bb +5 -0
index a1609d6..5321ed5 100644
@@ -11,6 +11,11 @@ EXTRA_IMAGEDEPENDS = ""
 
 IMAGE_INSTALL = "kexecboot"
 
+# Do not pollute the initrd image with rootfs features
+IMAGE_FEATURES = ""
+
+export IMAGE_BASENAME = "initramfs-kexecboot-image"
+
 IMAGE_LINGUAS = ""
 IMAGE_LOGIN_MANAGER = ""
 IMAGE_INIT_MANAGER = ""
recipes-bsp/images/initramfs-kexecboot-klibc-image.bb +2 -0
index d8e92ca..6c6de7a 100644
@@ -1,3 +1,5 @@
 require initramfs-kexecboot-image.bb
 
 IMAGE_INSTALL = "kexecboot-klibc"
+
+export IMAGE_BASENAME = "initramfs-kexecboot-klibc-image"
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/2 zaurus.inc: remove IMAGE_DEVICE_TABLES settings

In reply to Andrea Adami

* Zaurus devices are now only using devtmpfs enabled kernels

---
 conf/machine/include/zaurus.inc |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
conf/machine/include/zaurus.inc +0 -5
index ee24900..4419192 100644
@@ -17,11 +17,6 @@ EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}"
 
 EXTRA_IMAGEDEPENDS += "zaurus-installer"
 
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
-                       files/device_table_add-scsi.txt \
-                       files/device_table_add-loop.txt \
-                       "
-
 #########
 # xserver
 #########
Signature · 1 line
1.7.3.4
#3 lore raw

Re: [meta-handheld] [PATCH 2/2] zaurus.inc: remove IMAGE_DEVICE_TABLES settings

Quoted 21 lines · Andrea Adami

* Zaurus devices are now only using devtmpfs enabled kernels

---
 conf/machine/include/zaurus.inc |    5 -----

 1 files changed, 0 insertions(+), 5 deletions(-)
conf/machine/include/zaurus.inc +0 -0
index ee24900..4419192 100644
@@ -17,11 +17,6 @@ EXTRA_IMAGECMD_sum.jffs2 = "${EXTRA_IMAGECMD_jffs2}"
 

 EXTRA_IMAGEDEPENDS += "zaurus-installer"

conf/machine/include/zaurus.inc +0 -5
-IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt \
-                       files/device_table_add-scsi.txt \
-                       files/device_table_add-loop.txt \
-                       "
-

 #########

Quoted 5 lines
 # xserver
 #########
--
1.7.3.4

After this patch I'll test declaring
IMAGE_DEVICE_TABLES = ""

It remains to see if the /dev directory has to be manually added before.

Regards

Andrea

#4 lore raw
In reply to Andrea Adami
Quoted 5 lines · On Sunday 15 January 2012 01:03:04 Andrea Adami wrote:

* Standardize the initramfs-kexecboot images and adapt
* mimicking core-image-minimal-initramfs.
*
* Remove legacy device table for Zaurus, now using devtmpfs in kernel.

Quoted 8 lines

Andrea Adami (2):
initramfs-kexecboot-* images: adapt to oe-core zaurus.inc: remove IMAGE_DEVICETABLE settings, now using devtmpfs

 conf/machine/include/zaurus.inc                    |    5 -----
 recipes-bsp/images/initramfs-kexecboot-image.bb    |    5 +++++
 .../images/initramfs-kexecboot-klibc-image.bb      |    2 ++
 3 files changed, 7 insertions(+), 5 deletions(-)

Merged to meta-handheld master, thanks.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre