Skip to contentSkip to conversation

poky.conf: do not install packagegroup-core-device-devel into qemu images

PATCH In review Alexander Kanavin 3 participants 6 messages Aug 26, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 poky.conf: do not install packagegroup-core-device-devel into qemu images

The purpose of the group and what it should contain is no longer clear, and generally adding userspace development items to images is best done at the image/class level.

---
 meta-poky/conf/distro/poky.conf | 8 --------
 1 file changed, 8 deletions(-)
meta-poky/conf/distro/poky.conf +0 -8
index 826f0d633a..e55641d87f 100644
@@ -29,14 +29,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
 
-POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "packagegroup-core-device-devel",d)}"
-DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}"
-
 TCLIBCAPPEND = ""
 
 PREMIRRORS ??= "\
Signature · 1 line
2.28.0
#1 lore raw
Quoted 21 lines · Alexander Kanavin

The purpose of the group and what it should contain is no longer clear, and
generally adding userspace development items to images is best done at the image/class level.

---
 meta-poky/conf/distro/poky.conf | 8 --------
 1 file changed, 8 deletions(-)
meta- renamed from meta-poky/conf/distro/poky.conf +0 -0

poky/conf/distro/poky.conf
index 826f0d633a..e55641d87f 100644

meta-poky/conf/distro/poky.conf +0 -1
@@ -29,14 +29,6 @@ SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
 DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
 
-POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-

3.0", "", "packagegroup-core-device-devel",d)}"

meta-poky/conf/distro/poky.conf SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" · line 32

Quoted 8 lines
meta-poky/conf/distro/poky.conf +0 -7
-DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}"
-DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}"
-
 TCLIBCAPPEND = ""

A test build is showing this isn't going to be without issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/2343

(the rest is still building)

Cheers,

Richard

#3 lore raw
Quoted 11 lines · Alexander Kanavin
Quoted 5 lines · Richard Purdie

A test build is showing this isn't going to be without issues:

https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/2343

(the rest is still building)

The x32 test, and the multilib test both need binutils in core-image- sato - probably should be tweaked in config.json, as neither test is added to TEST_SUITES by default?

That feels extremely ugly but its one way to address it I guess :/

Cheers,

Richard

#4 lore raw
Quoted 5 lines · Richard Purdie
Quoted 3 lines

The x32 test, and the multilib test both need binutils in core-image- sato - probably should be tweaked in config.json, as neither test is added to TEST_SUITES by default?

That feels extremely ugly but its one way to address it I guess :/

Would it be better to make the tests check for binutils being present, and then ensuring that at least some of those tests are executed with core-image-sato-sdk or similar?

Ross

#5 lore raw
Quoted 8 lines · Ross Burton
Quoted 6 lines · Richard Purdie
Quoted 5 lines

The x32 test, and the multilib test both need binutils in core- image-
sato - probably should be tweaked in config.json, as neither test is
added to TEST_SUITES by default?

Quoted 6 lines
Quoted 1 line

That feels extremely ugly but its one way to address it I guess :/

Would it be better to make the tests check for binutils being present,
and then ensuring that at least some of those tests are executed with core-image-sato-sdk or similar?

Alex sent a patch to autobuilder-helper so I replied there.

I'm wondering why we don't scp the file and then run readelf locally on the server which avoids this problem?

Cheers,

Richard