Skip to contentSkip to conversation

Fixes for self-hosted-image v3

PATCH Applied Paul Eggleton 2 participants 5 messages Apr 5, 2012 – Apr 6, 2012

lore
Share & tools
lore

Paul Eggleton

author
#0 lore raw

cover Fixes for self-hosted-image v3

Rebase my earlier patch and add a fix for Yocto bug #2208. Note that I have included Dexuan's fix for the sudoers file path to avoid conflicts.

The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:

self-hosted-image: Increase space for build and allow builder user sudo access (2012-04-04 17:17:11 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/self
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/self

Dexuan Cui (1):
self-hosted-image: use the correct location of the file sudoers

Paul Eggleton (2):
self-hosted-image: decrease reserved space to 0.5%
self-hosted-image: use Clearlooks theme

 meta/recipes-core/images/self-hosted-image.bb |   13 +++++++++++--
 meta/recipes-core/tasks/task-self-hosted.bb   |    3 ++-
 2 files changed, 13 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.5.4
author
#1 lore raw

PATCH 1/3 self-hosted-image: use the correct location of the file sudoers

From: Dexuan Cui <[email protected]>

Signed-off-by Dexuan Cui <[email protected]>
---
 meta/recipes-core/images/self-hosted-image.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-core/images/self-hosted-image.bb +1 -1
index 1db6a7a..d8f4162 100644
@@ -49,7 +49,7 @@ fakeroot do_populate_poky_src () {
 	chown -R builder.builder  ${IMAGE_ROOTFS}/home/builder/poky
 
 	# Allow builder to use sudo to setup tap/tun
-	echo "builder ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
 }
 
 IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
Signature · 1 line
1.7.5.4
author
#2 lore raw

PATCH 2/3 self-hosted-image: decrease reserved space to 0.5%

In reply to Paul Eggleton

The default amount of reserved space for ext2/3 is 5% - this amounts to about 2GB of a 40GB filesystem that the builder user can't make use of. We don't need this much reserved so peg it back to 0.5% which should be more than enough.

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-core/images/self-hosted-image.bb |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
meta/recipes-core/images/self-hosted-image.bb +6 -1
index d8f4162..2a21967 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r9"
+PR = "r10"
 
 IMAGE_FEATURES += "x11-mini package-management"
 

@@ -21,6 +21,11 @@ inherit core-image
 SRCREV = "8691a588267472eb5a32b978a0eb9ddfd0c91733"
 SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
 
+IMAGE_CMD_ext3_append () {
+	# We don't need to reserve much space for root, 0.5% is more than enough
+	tune2fs -m 0.5 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3
+}
+
 fakeroot do_populate_poky_src () {
 	# Because fetch2's git's unpack uses -s cloneflag, the unpacked git repo
 	# will become invalid in the target.
Signature · 1 line
1.7.5.4
author
#3 lore raw

PATCH 3/3 self-hosted-image: use Clearlooks theme

In reply to Paul Eggleton

Use a nicer theme (Clearlooks) to improve Hob's appearance in the self hosted image and fix the progress bar not changing colour when the build fails.

Fixes [YOCTO #2208]

Signed-off-by Paul Eggleton <[email protected]>
---
 meta/recipes-core/images/self-hosted-image.bb |    6 +++++-
 meta/recipes-core/tasks/task-self-hosted.bb   |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-core/images/self-hosted-image.bb +5 -1
index 2a21967..62b09b1 100644
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r10"
+PR = "r11"
 
 IMAGE_FEATURES += "x11-mini package-management"
 

@@ -55,6 +55,10 @@ fakeroot do_populate_poky_src () {
 
 	# Allow builder to use sudo to setup tap/tun
 	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
+
+	# Use Clearlooks GTK+ theme
+	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
+	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
 }
 
 IMAGE_PREPROCESS_COMMAND += "do_populate_poky_src; "
meta/recipes-core/tasks/task-self-hosted.bb +2 -1
index 87928b6..6a24a7f 100644
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Create Basic Image Tasks"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"

@@ -194,4 +194,5 @@ RDEPENDS_task-self-hosted-graphics = "\
     libsdl-dev \
     libx11-dev \
     python-pygtk \
+    gtk-theme-clearlooks \
     "
Signature · 1 line
1.7.5.4
Applied
#4 lore raw
In reply to Paul Eggleton
Quoted 15 lines · Paul Eggleton

Rebase my earlier patch and add a fix for Yocto bug #2208. Note that I have included Dexuan's fix for the sudoers file path to avoid conflicts.

The following changes since commit 3e4562500956550dbae5467a5fe9289f1d32f775:

self-hosted-image: Increase space for build and allow builder user sudo access (2012-04-04 17:17:11 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/self
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/self

Dexuan Cui (1):
self-hosted-image: use the correct location of the file sudoers

Quoted 8 lines

Paul Eggleton (2):
self-hosted-image: decrease reserved space to 0.5%
self-hosted-image: use Clearlooks theme

  meta/recipes-core/images/self-hosted-image.bb |   13 +++++++++++--
  meta/recipes-core/tasks/task-self-hosted.bb   |    3 ++-
  2 files changed, 13 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!