Minor and trivial fixes

PATCH Applied Otavio Salvador 2 participants 5 messages Oct 2, 2011 – Oct 4, 2011

lore

Share & tools

lore

Otavio Salvador

author

2011-10-02 18:21 UTC #0 lore raw

cover Minor and trivial fixes

The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:

base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)

are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD

Otavio Salvador (3):
image.bbclass: improve comments regarding exported functions image-live.bbclass: allow images to override ROOTFS and INITRD bootimg.bbclass: fix comment typo

 meta/classes/bootimg.bbclass    |    2 +-
 meta/classes/image-live.bbclass |    4 ++--
 meta/classes/image.bbclass      |    5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-02 18:21 UTC #1 lore raw

PATCH 1/3 image.bbclass: improve comments regarding exported functions

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/image.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

meta/classes/image.bbclass +1 -4

index f17e989..0b75dce 100644
@@ -254,9 +254,8 @@ multilib_sanity_check() {
   echo $@ | python ${MULTILIB_CHECK_FILE}
 }
 
-# set '*' as the rootpassword so the images
+# set '*' as the root password so the images
 # can decide if they want it or not
-
 zap_root_password () {
 	sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
 	mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd

@@ -314,8 +313,6 @@ rootfs_trim_schemas () {
 	done
 }
 
-
-# export the zap_root_password, and remote_init_link
 EXPORT_FUNCTIONS zap_root_password remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp rootfs_no_x_startup
 
 addtask rootfs before do_build after do_install

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-02 18:21 UTC #2 lore raw

PATCH 2/3 image-live.bbclass: allow images to override ROOTFS and INITRD

In reply to Otavio Salvador

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/image-live.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/image-live.bbclass +2 -2

index c910488..1d184a1 100644
@@ -1,11 +1,11 @@
 
 AUTO_SYSLINUXCFG = "1"
-INITRD = "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
+INITRD ?= "${DEPLOY_DIR_IMAGE}/core-image-minimal-initramfs-${MACHINE}.cpio.gz"
 APPEND += "root=/dev/ram0 "
 TIMEOUT = "10"
 LABELS += "boot install"
 
-ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
+ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_BASENAME}-${MACHINE}.ext3"
 
 do_bootimg[depends] += "core-image-minimal-initramfs:do_rootfs"
 do_bootimg[depends] += "${IMAGE_BASENAME}:do_rootfs"

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-02 18:21 UTC #3 lore raw

PATCH 3/3 bootimg.bbclass: fix comment typo

In reply to Otavio Salvador

Signed-off-by Otavio Salvador <[email protected]>

---
 meta/classes/bootimg.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/classes/bootimg.bbclass +1 -1

index 49ee85e..a5ba3cf 100644
@@ -7,7 +7,7 @@
 #
 # End result is two things:
 #
-# 1. A .hddimage file which is an msdos filesystem containing syslinux, a kernel, 
+# 1. A .hddimg file which is an msdos filesystem containing syslinux, a kernel,
 # an initrd and a rootfs image. These can be written to harddisks directly and 
 # also booted on USB flash disks (write them there with dd).
 #

Signature · 1 line

1.7.2.5

Richard Purdie

Applied

2011-10-04 22:02 UTC #4 lore raw

In reply to Otavio Salvador

Quoted 13 lines · Otavio Salvador

The following changes since commit c54c1280fc0d06a53e23339c3913ec88eead13d9:
base.bbclass: Drop unneeded dependency (2011-09-30 11:34:44 +0100)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD
Otavio Salvador (3):
image.bbclass: improve comments regarding exported functions image-live.bbclass: allow images to override ROOTFS and INITRD bootimg.bbclass: fix comment typo

Quoted 4 lines

 meta/classes/bootimg.bbclass    |    2 +-
 meta/classes/image-live.bbclass |    4 ++--
 meta/classes/image.bbclass      |    5 +----
 3 files changed, 4 insertions(+), 7 deletions(-)

Merged to master, thanks.

Richard