Qt4 and image building improvements

PATCH Applied Otavio Salvador 2 participants 6 messages Oct 13, 2011 – Oct 14, 2011

lore

Share & tools

lore

Otavio Salvador

author

2011-10-13 14:47 UTC #0 lore raw

cover Qt4 and image building improvements

The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:

xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +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 (4):
image-live.bbclass: allow override of initrd image
initramfs-live-boot: make it more generic and easy to use
qt4: use 4.7.4 as default preference distro_tracking_fields.inc: update qt4 related entries

 meta/classes/image-live.bbclass                    |    5 ++-
 .../conf/distro/include/distro_tracking_fields.inc |   32 ++++++++++----------
 meta/recipes-core/initrdscripts/files/init-live.sh |   32 ++++++++++++-------
 .../initrdscripts/initramfs-live-boot_1.0.bb       |    3 +-
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb          |    1 -
 meta/recipes-qt/qt4/qt4-native_4.7.4.bb            |    1 -
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb   |    2 -
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb          |    2 -
 8 files changed, 41 insertions(+), 37 deletions(-)

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-13 14:47 UTC #1 lore raw

PATCH 1/4 image-live.bbclass: allow override of initrd image

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

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

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

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

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-13 14:47 UTC #2 lore raw

PATCH 2/4 initramfs-live-boot: make it more generic and easy to use

In reply to Otavio Salvador

The script was making some assumptions that enforced many requirement in the machine kernel configuration and usage, besides it were too while booting.

Changes included:

* fix indentation;
* rdepends on udev;
* allow use of isofs as module;
* remove rootdelay param parsing as it was unused;
* don't verbosely kill udevd and mknod;
* mount devtmpfs into rootfs, if available, before swithing root;

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

---
 meta/recipes-core/initrdscripts/files/init-live.sh |   32 ++++++++++++-------
 .../initrdscripts/initramfs-live-boot_1.0.bb       |    3 +-
 2 files changed, 22 insertions(+), 13 deletions(-)

meta/recipes-core/initrdscripts/files/init-live.sh +20 ~~-12~~

index c054863..eb5ab5b 100644
@@ -13,6 +13,11 @@ early_setup() {
     mkdir /sys
     mount -t proc proc /proc
     mount -t sysfs sysfs /sys
+
+    # support modular kernel
+    modprobe isofs 2> /dev/null
+
+    mkdir /run
     udevd --daemon
     udevadm trigger --action=add
 }

@@ -25,21 +30,25 @@ read_args() {
             root=*)
                 ROOT_DEVICE=$optarg ;;
             rootfstype=*)
-                ROOT_FSTYPE=$optarg ;;
-            rootdelay=*)
-                rootdelay=$optarg ;;
-	    LABEL=*)
-		label=$optarg ;;
-	    video=*)
-		video_mode=$arg ;;
-	    vga=*)
-		vga_mode=$arg ;;
+                modprobe $optarg 2> /dev/null ;;
+            LABEL=*)
+                label=$optarg ;;
+            video=*)
+                video_mode=$arg ;;
+            vga=*)
+                vga_mode=$arg ;;
         esac
     done
 }
 
 boot_live_root() {
-    killall udevd
+    killall udevd 2>/dev/null
+
+    # use devtmpfs if available
+    if grep -q devtmpfs /proc/filesystems; then
+        mount -t devtmpfs devtmpfs $ROOT_MOUNT/dev
+    fi
+
     cd $ROOT_MOUNT
     exec switch_root -c /dev/console $ROOT_MOUNT /sbin/init
 }

@@ -78,7 +87,7 @@ done
 case $label in
     boot)
 	mkdir $ROOT_MOUNT
-	mknod /dev/loop0 b 7 0
+	mknod /dev/loop0 b 7 0 2>/dev/null
 
 	if ! $MOUNT -o rw,loop,noatime,nodiratime /media/$i/$ISOLINUX/$ROOT_IMAGE $ROOT_MOUNT ; then
 	    fatal "Couldnt mount rootfs image"

@@ -97,4 +106,3 @@ case $label in
 	fatal "Installation image failed"
 	;;
 esac
-

meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb +2 -1

index b404f8c..e85a0e1 100644
@@ -1,9 +1,10 @@
 DESCRIPTION = "A live image init script"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+RDEPENDS = "udev"
 SRC_URI = "file://init-live.sh"
 
-PR = "r6"
+PR = "r7"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init-live.sh ${D}/init

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-13 14:47 UTC #3 lore raw

PATCH 3/4 qt4: use 4.7.4 as default preference

In reply to Otavio Salvador

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

---
 meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb        |    1 -
 meta/recipes-qt/qt4/qt4-native_4.7.4.bb          |    1 -
 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb |    2 --
 meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb        |    2 --
 4 files changed, 0 insertions(+), 6 deletions(-)

meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb +0 -1

index 34061cb..e34ec8d 100644
@@ -9,4 +9,3 @@ QT_CONFIG_FLAGS += " \
  -exceptions \
 "
 
-DEFAULT_PREFERENCE = "-1"

meta/recipes-qt/qt4/qt4-native_4.7.4.bb +0 -1

index 7196c73..3be4d73 100644
@@ -15,4 +15,3 @@ TOBUILD := "src/tools/bootstrap ${TOBUILD}"
 SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
 SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
 
-DEFAULT_PREFERENCE = "-1"

meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb +0 -2

index 77e1f36..4c90d57 100644
@@ -7,5 +7,3 @@ SRC_URI += "file://blacklist-diginotar-certs.diff \
 
 SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf"
 SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e"
-
-DEFAULT_PREFERENCE = "-1"

meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb +0 -2

index 0290313..8c48936 100644
@@ -9,5 +9,3 @@ QT_CONFIG_FLAGS += " \
  -no-embedded \
  -xrandr \
  -x11"
-
-DEFAULT_PREFERENCE = "-1"

Signature · 1 line

1.7.2.5

Otavio Salvador

author

2011-10-13 14:47 UTC #4 lore raw

PATCH 4/4 distro_tracking_fields.inc: update qt4 related entries

In reply to Otavio Salvador

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

---
 .../conf/distro/include/distro_tracking_fields.inc |   32 ++++++++++----------
 1 files changed, 16 insertions(+), 16 deletions(-)

meta/conf/distro/include/distro_tracking_fields.inc +16 ~~-16~~

index b07209e..95bdda1 100644
@@ -3445,34 +3445,34 @@ RECIPE_MAINTAINER_pn-imake = "Yu Ke <[email protected]>"
 DISTRO_PN_ALIAS_pn-imake = "Mandriva=xutils Ubuntu=xutils"
 
 RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
-RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-native = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-native = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-native = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-native = "September 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-native = "Paul Eggleton <[email protected]>"
 DISTRO_PN_ALIAS_pn-qt4-tools-native = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
 
 RECIPE_STATUS_pn-qt4-tools-nativesdk = "green"
-RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-tools-nativesdk = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-tools-nativesdk = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-tools-nativesdk = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-tools-nativesdk = "September 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-tools-nativesdk = "Paul Eggleton <[email protected]>"
 DISTRO_PN_ALIAS_pn-qt4-tools-nativesdk = "Mandriva=libqt4-devel Ubuntu=libqt4-dev"
 
 RECIPE_STATUS_pn-qt4-embedded = "green"
-RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-embedded = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-embedded = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-embedded = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-embedded = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-embedded = "September 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-embedded = "Paul Eggleton <[email protected]>"
 DISTRO_PN_ALIAS_pn-qt4-embedded = "OSPDT"
 
 RECIPE_STATUS_pn-qt4-x11-free = "green"
-RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.3"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "2 months"
-RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/05/04"
-RECIPE_LAST_UPDATE_pn-qt4-x11-free = "May 12, 2011"
+RECIPE_LATEST_VERSION_pn-qt4-x11-free = "4.7.4"
+RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-qt4-x11-free = "4 months"
+RECIPE_LATEST_RELEASE_DATE_pn-qt4-x11-free = "2011/09/01"
+RECIPE_LAST_UPDATE_pn-qt4-x11-free = "September 10, 2011"
 RECIPE_MAINTAINER_pn-qt4-x11-free = "Paul Eggleton <[email protected]"
 DISTRO_PN_ALIAS_pn-qt4-x11-free = "Ubuntu=qt-x11-free Debian=qt-x11-free"

Signature · 1 line

1.7.2.5

Richard Purdie

Applied

2011-10-14 12:38 UTC #5 lore raw

In reply to Otavio Salvador

Quoted 8 lines · Otavio Salvador

The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:
xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)
are available in the git repository at:
git://github.com/OSSystems/oe-core master
https://github.com/OSSystems/oe-core/tree/HEAD

Quoted 5 lines

Otavio Salvador (4):
image-live.bbclass: allow override of initrd image
initramfs-live-boot: make it more generic and easy to use
qt4: use 4.7.4 as default preference distro_tracking_fields.inc: update qt4 related entries

Merged to master, thanks.

Richard