Self-Hosted Image patches

PATCH In review Saul Wold 4 participants 8 messages Apr 17, 2012 – Apr 18, 2012

lore

Share & tools

lore

Saul Wold

author

2012-04-17 21:56 UTC #0 lore raw

cover 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.

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 the lsb-release
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(-)

Signature · 1 line

1.7.7.6

Saul Wold

author

2012-04-17 21:56 UTC #1 lore raw

PATCH 1/3 lsb: Add DISTRO Info to the lsb-release

This is needed for distro checking code in the self-hosted-image

Signed-off-by Saul Wold <[email protected]>

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

meta/recipes-extended/lsb/lsb_1.4.bb +5 -0

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

Signature · 1 line

1.7.7.6

Koen Kooi

2012-04-18 06:54 UTC #2 lore raw

Re: [PATCH 1/3] lsb: Add DISTRO Info to the lsb-release

Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:

Quoted 21 lines

This is needed for distro checking code in the self-hosted-image
Signed-off-by Saul Wold <[email protected]>
---
meta/recipes-extended/lsb/lsb_1.4.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
meta/recipes-extended/lsb/lsb_1.4.bb +0 -0
index f2f25ba..e414d93 100644
@@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
LICENSE = "GPLv2+"
PR = "r2"
meta/recipes-extended/lsb/lsb_1.4.bb +2 -0
+DEPENDS="util-linux"
+
LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"
SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \

meta/recipes-extended/lsb/lsb_1.4.bb do_install(){ · line 38

Quoted 6 lines

meta/recipes-extended/lsb/lsb_1.4.bb +3 -0

@@ -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

MIssing PR bump

Martin Jansa

2012-04-18 07:00 UTC #3 lore raw

Re: [PATCH 1/3] lsb: Add DISTRO Info to the lsb-release

Quoted 22 lines · Koen Kooi

Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:
Quoted 19 lines
This is needed for distro checking code in the self-hosted-image
Signed-off-by Saul Wold <[email protected]>
---
meta/recipes-extended/lsb/lsb_1.4.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
meta/recipes-extended/lsb/lsb_1.4.bb +0 -0
index f2f25ba..e414d93 100644
@@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
LICENSE = "GPLv2+"
PR = "r2"
meta/recipes-extended/lsb/lsb_1.4.bb +2 -0
+DEPENDS="util-linux"
+
LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"

Quoted 10 lines

meta/recipes-extended/lsb/lsb_1.4.bb do_install(){ · line 38
Quoted 8 lines
SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
meta/recipes-extended/lsb/lsb_1.4.bb +3 -0
@@ -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
MIssing PR bump

And spaces around = in added DEPENDS

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Richard Purdie

2012-04-18 11:18 UTC #4 lore raw

Re: [PATCH 1/3] lsb: Add DISTRO Info to the lsb-release

In reply to Koen Kooi

Quoted 21 lines · Koen Kooi

Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:
Quoted 19 lines
This is needed for distro checking code in the self-hosted-image
Signed-off-by Saul Wold <[email protected]>
---
meta/recipes-extended/lsb/lsb_1.4.bb | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
meta/recipes-extended/lsb/lsb_1.4.bb +0 -0
index f2f25ba..e414d93 100644
@@ -4,6 +4,8 @@ HOMEPAGE = "http://prdownloads.sourceforge.net/lsb"
LICENSE = "GPLv2+"
PR = "r2"
meta/recipes-extended/lsb/lsb_1.4.bb +2 -0
+DEPENDS="util-linux"
+
LIC_FILES_CHKSUM = "file://README;md5=12da544b1a3a5a1795a21160b49471cf"

Quoted 10 lines

meta/recipes-extended/lsb/lsb_1.4.bb do_install(){ · line 38
Quoted 8 lines
SRC_URI = "${SOURCEFORGE_MIRROR}/project/lsb/lsb_release/${PV}/lsb-release-${PV}.tar.gz \
meta/recipes-extended/lsb/lsb_1.4.bb +3 -0
@@ -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
MIssing PR bump

I've added one and fixes some other problems I noticed whilst testing it :(.

Cheers,

Richard

Saul Wold

author

2012-04-17 21:56 UTC #5 lore raw

PATCH 2/3 task-self-hosted: Add LSB for distro info

In reply to Saul Wold

Signed-off-by Saul Wold <[email protected]>

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

meta/recipes-core/tasks/task-self-hosted.bb +1 -0

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 \

Signature · 1 line

1.7.7.6

Koen Kooi

2012-04-18 06:55 UTC #6 lore raw

Re: [PATCH 2/3] task-self-hosted: Add LSB for distro info

Op 17 apr. 2012, om 23:46 heeft Saul Wold het volgende geschreven:

Quoted 10 lines

Signed-off-by Saul Wold <[email protected]>
---
meta/recipes-core/tasks/task-self-hosted.bb | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
meta/recipes-core/tasks/task-self-hosted.bb +0 -0
index 5588cd3..5d4e153 100644

meta/recipes-core/tasks/task-self-hosted.bb RDEPENDS_task-self-hosted-host-tools = "\ · line 50

Quoted 7 lines

meta/recipes-core/tasks/task-self-hosted.bb +1 -0

@@ -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 \

MIssing PR bump

Saul Wold

author

2012-04-17 21:56 UTC #7 lore raw

PATCH 3/3 self-hosted-image: remove BB_NO_NETWORK and update Poky SRCREV

In reply to Saul Wold

Signed-off-by Saul Wold <[email protected]>

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

meta/recipes-core/images/self-hosted-image.bb +2 -3

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

Signature · 1 line

1.7.7.6