v2 Self-Hosted Image patches

Richard,

This set of changes adds the lsb_release command and sets the i/etc/lsb-release file up correctly for the release.

I also am removing the BB_NO_NETWORK from the self-hosted image to allow it to have network, and updating the SRCREV, which you might have to do again to get these patches actaully into the image.

V2: better commit messages

Thanks
Sau!

The following changes since commit 89788fbd10fdfbbe54927339d7ec516d0e4d7ef5:

libproxy: Allow to build in non-gplv3 configuration (2012-04-17 14:08:27 +0100)

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

Saul Wold (3):
lsb: Add DISTRO Info to /etc/lsb-release file also add util-linux to
DEPENDS
task-self-hosted: Add LSB for distro info
self-hosted-image: remove BB_NO_NETWORK and update Poky SRCREV

 meta/recipes-core/images/self-hosted-image.bb |    5 ++---
 meta/recipes-core/tasks/task-self-hosted.bb   |    1 +
 meta/recipes-extended/lsb/lsb_1.4.bb          |    5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

1.7.7.6

Add the DISTRO* fields to the /etc/lsb-release file so the distro parsing code can find standard information about the Poky Distro when using the Self-Hosted Image.

The lsb_release command uses getopt which is provided by util-linux

---
 meta/recipes-extended/lsb/lsb_1.4.bb |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

index f2f25ba..e414d93 100644
@@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
 LICENSE = "GPLv2+"
 PR = "r2"
 
+DEPENDS="util-linux"
+
 LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \

@@ -31,6 +33,9 @@ do_install(){
 		echo -n "core-4.1-${TARGET_ARCH}" >>  ${D}/etc/lsb-release
 	fi
 	echo "\"" >> ${D}/etc/lsb-release
+	echo "DISTRIB_ID=${DISTRO}" >> ${D}/etc/lsb-release
+	echo "DISTRIB_RELEASE=${DISTRO_VERSION}" >> ${D}/etc/lsb-release
+	echo "DISTRIB_DESCRIPTION=\"${DISTRO_NAME} ${DISTRO_VERSION}\"" >> ${D}/etc/lsb-release
 	
 	if [ "${TARGET_ARCH}" == "i586" ];then
 		mkdir -p ${D}/etc/lsb-release.d

1.7.7.6

The lsb package is needed to enable the distro checking in the self hosted image. Currently there is no standard identification in the self-hosted image so use the existing lsb package which provides lsb_release that parses the /etc/release file

---
 meta/recipes-core/tasks/task-self-hosted.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

index 5588cd3..5d4e153 100644
@@ -44,6 +44,7 @@ RDEPENDS_task-self-hosted-host-tools = "\
     kernel-module-iptable-nat \
     kernel-module-iptable-mangle \
     kernel-module-iptable-filter \
+    lsb \
     mc \
     parted \
     pseudo \

1.7.7.6

Remove BB_NO_NETWORK because we can not guarentee that all downloads will be available in the self-hosted image for the possible targets being built. If this image is run with out networking, failures may be seen and BB_NO_NETWORK should be set via the Hob

Update the Poky SRCREV so it has the latest set of fixes and patches.

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

index 46e7209..fbcdf4c 100644
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
-PR = "r11"
+PR = "r12"
 
 IMAGE_FEATURES += "x11-mini package-management"
 

@@ -19,7 +19,7 @@ IMAGE_FSTYPES = "vmdk"
 
 inherit core-image
 
-SRCREV = "8691a588267472eb5a32b978a0eb9ddfd0c91733"
+SRCREV = "20ff9db92165e6d16897671d2b1d370661962712"
 SRC_URI = "git://git.yoctoproject.org/poky;protocol=git"
 
 IMAGE_CMD_ext3_append () {

@@ -43,7 +43,6 @@ fakeroot do_populate_poky_src () {
 	rm -rf ${IMAGE_ROOTFS}/home/builder/poky/build/downloads/git2_*
 
 	echo "/usr/bin" > ${IMAGE_ROOTFS}/home/builder/poky/build/pseudodone
-	echo "BB_NO_NETWORK = \"1\"" > ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
 	echo "INHERIT += \"rm_work\"" >> ${IMAGE_ROOTFS}/home/builder/poky/build/conf/auto.conf
 	mkdir -p ${IMAGE_ROOTFS}/home/builder/pseudo
 	echo "export PSEUDO_PREFIX=/usr" >> ${IMAGE_ROOTFS}/home/builder/.bashrc

1.7.7.6

Op 18 apr. 2012, om 00:02 heeft Saul Wold het volgende geschreven:

V3: add PR bumps :)