Skip to contentSkip to conversation

Remove allarch from recipes which rdeps TUNE_PKGARCH packages

PATCH New [email protected] 1 participant 3 messages Aug 3, 2018

lore
Share & tools
lore

[email protected]

author
#0 lore raw

v3 cover Remove allarch from recipes which rdeps TUNE_PKGARCH packages

From: Kai Kang <[email protected]>

V3:
* Oops. Update commit short message according to patchtest.

The following changes since commit da24071e92071ecbefe51314d82bf40f85172485:

bitbake: toaster/orm/management/commands/lsupdates.py: Use new layerindexlib module (2018-08-02 10:18:27 +0100)

are available in the Git repository at:

git://git.pokylinux.org/poky-contrib kangkai/allarch
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/allarch

Kai Kang (2):
allarch: remove allarch from recipes which rdepends on TUNE_PKGARCH
packages
layer.conf: update SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS

 meta/conf/layer.conf                                       | 7 -------
 meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb     | 2 +-
 meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb    | 2 --
 meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb | 2 --
 .../initrdscripts/initramfs-module-setup-live_1.0.bb       | 2 --
 .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb          | 1 -
 meta/recipes-graphics/wayland/weston-init.bb               | 2 +-
 meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb        | 2 --
 meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb      | 2 +-
 .../ca-certificates/ca-certificates_20170717.bb            | 2 --
 10 files changed, 3 insertions(+), 21 deletions(-)
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v3 1/2 allarch: remove allarch from recipes which rdepends on TUNE_PKGARCH packages

From: Kai Kang <[email protected]>

The following allarch packages rdepends on TUNE_PKGARCH packages. So remove allarch from these recipes.

ca-certificates -> openssl
docbook-xsl-stylesheets -> perl
font-alias -> font-util
initramfs-module-setup-live -> udev-extraconf initramfs-framework -> ${VIRTUAL-RUNTIME_base-utils} (busybox by default) ppp-dialin -> ppp
resolvconf -> bash
weston-init -> weston kbd
xorg-minimal-fonts -> font-alias

Signed-off-by Kai Kang <[email protected]>
---
 meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb          | 2 +-
 meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb         | 2 --
 meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb      | 2 --
 .../initrdscripts/initramfs-module-setup-live_1.0.bb            | 2 --
 .../docbook-xml/docbook-xsl-stylesheets_1.79.1.bb               | 1 -
 meta/recipes-graphics/wayland/weston-init.bb                    | 2 +-
 meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb             | 2 --
 meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb           | 2 +-
 .../recipes-support/ca-certificates/ca-certificates_20170717.bb | 2 --
 9 files changed, 3 insertions(+), 14 deletions(-)
meta/recipes-connectivity/ppp-dialin/ppp-dialin_0.1.bb +1 -1
index b5f68951d7..eee6ef6518 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
 SRC_URI = "file://host-peer \
            file://ppp-dialin"
 
-inherit allarch useradd
+inherit useradd
 
 S = "${WORKDIR}"
meta/recipes-connectivity/resolvconf/resolvconf_1.79.bb +0 -2
index 8550177288..0fdd479e1c 100644
@@ -23,8 +23,6 @@ SRC_URI[sha256sum] = "8e2843cd4162b706f0481b3c281657728cbc2822e50a64fff79b79bd8a
 # so we check the latest upstream from a directory that does get updated
 UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/"
 
-inherit allarch
-
 do_compile () {
 	:
 }
meta/recipes-core/initrdscripts/initramfs-framework_1.0.bb +0 -2
index 6337b998ac..6d1dbdd2b8 100644
@@ -5,8 +5,6 @@ RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_base-utils}"
 
 PR = "r4"
 
-inherit allarch
-
 SRC_URI = "file://init \
            file://exec \
            file://nfsrootfs \
meta/recipes-core/initrdscripts/initramfs-module-setup-live_1.0.bb +0 -2
index 4d2fe9dd2b..26468c1b5d 100644
@@ -5,8 +5,6 @@ RDEPENDS_${PN} = "initramfs-framework-base udev-extraconf"
 
 PR = "r4"
 
-inherit allarch
-
 FILESEXTRAPATHS_prepend := "${THISDIR}/initramfs-framework:"
 SRC_URI = "file://setup-live"
meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +0 -1
index 07d32ce979..c1bcc1743c 100644
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/"
 
 S = "${WORKDIR}/docbook-xsl-${PV}"
 
-inherit allarch
 BBCLASSEXTEND = "native"
 
 do_configure (){
meta/recipes-graphics/wayland/weston-init.bb +1 -1
index 22ba5f3fb3..f3b4398295 100644
@@ -18,7 +18,7 @@ do_install() {
 	sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start
 }
 
-inherit allarch update-rc.d distro_features_check systemd
+inherit update-rc.d distro_features_check systemd
 
 # rdepends on weston which depends on virtual/egl
 REQUIRED_DISTRO_FEATURES = "opengl"
meta/recipes-graphics/xorg-font/font-alias_1.0.3.bb +0 -2
index 15e101596a..de1c8ead38 100644
@@ -15,8 +15,6 @@ DEPENDS = "util-macros-native font-util-native"
 RDEPENDS_${PN} = "encodings font-util"
 RDEPENDS_${PN}_class-native = "font-util-native"
 
-inherit allarch
-
 PE = "1"
 PR = "${INC_PR}.3"
meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +1 -1
index 9bcd1b2fa6..9740df45f6 100644
@@ -13,7 +13,7 @@ SRC_URI = "file://misc"
 PE = "1"
 PR = "r2"
 
-inherit allarch distro_features_check
+inherit distro_features_check
 
 # The font-alias requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
meta/recipes-support/ca-certificates/ca-certificates_20170717.bb +0 -2
index 24d3a6e4d3..e29cefd638 100644
@@ -27,8 +27,6 @@ SRC_URI = "git://salsa.debian.org/debian/ca-certificates.git;protocol=https \
 
 S = "${WORKDIR}/git"
 
-inherit allarch
-
 EXTRA_OEMAKE = "\
     'CERTSDIR=${datadir}/ca-certificates' \
     'SBINDIR=${sbindir}' \
Signature · 1 line
2.17.1
author
#2 lore raw

PATCH v3 2/2 layer.conf: update SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS

In reply to [email protected]

From: Kai Kang <[email protected]>

allarch has been removed from some packages which rdepends on TUNE_PKGARCH packages, so remove related depenencies from SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS.

Signed-off-by Kai Kang <[email protected]>
---
 meta/conf/layer.conf | 7 -------
 1 file changed, 7 deletions(-)
meta/conf/layer.conf +0 -7
index 315fb936fa..49ce7a913a 100644
@@ -53,10 +53,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->icecc-create-env-native \
   gcc-cross-${TARGET_ARCH}->virtual/${TARGET_PREFIX}libc-for-gcc \
   gcc-cross-${TARGET_ARCH}->linux-libc-headers \
-  ppp-dialin->ppp \
-  resolvconf->bash \
-  docbook-xsl-stylesheets->perl \
-  ca-certificates->openssl \
   initramfs-framework->${VIRTUAL-RUNTIME_base-utils} \
   initramfs-framework->eudev \
   initramfs-framework->systemd \

@@ -72,10 +68,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   liberation-fonts->fontconfig \
   cantarell-fonts->fontconfig \
   gnome-icon-theme->librsvg \
-  font-alias->font-util \
   systemd-boot->systemd-bootconf \
-  weston-init->weston \
-  weston-init->kbd \
 "
 
 # We need to keep bitbake tools in PATH
Signature · 1 line
2.17.1