Skip to contentSkip to conversation

packagegroup-meta-oe.bb: Move debsums to a bbappend under perl-layer

PATCH New Khem Raj 1 participant 2 messages Mar 30, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 packagegroup-meta-oe.bb: Move debsums to a bbappend under perl-layer

This helps avoid dependency on meta-perl

---
 .../recipes-core/packagegroups/packagegroup-meta-oe.bb         | 2 +-
 .../recipes-core/packagegroups/packagegroup-meta-oe.bbappend   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb +1 -1
index e04b48f85a..f4931aeeba 100644
@@ -240,7 +240,7 @@ NE10_armv7ve = "ne10"
 RDEPENDS_packagegroup-meta-oe-support ="\
     anthy asio atop augeas avro-c bdwgc frame grail c-ares \
     ccid ceres-solver ckermit cpprest ctapi-common daemonize \
-    daemontools debsums devmem2 dfu-util dfu-util-native digitemp \
+    daemontools devmem2 dfu-util dfu-util-native digitemp \
     dstat eject enca epeg espeak fbset fbset-modes \
     fftw fltk-native gd gflags glog gnulib gperftools \
     gpm gradm gsl gsoap hddtemp hidapi htop hunspell hwdata iksemel \
meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend new file +3 -0
new file mode 100644
index 0000000000..e7b43204b6
@@ -0,0 +1,3 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+RDEPENDS_packagegroup-meta-oe-support += "debsums"
Signature · 1 line
2.26.0
author
#1 lore raw

PATCH 2/2 packagegroups: Add bbappends for python and perl layer requiring recipes

Add this bbappends in dynamic layers
Move the main recipe back to meta-oe main recipes

---
 .../packagegroup-meta-oe.bbappend             | 20 +++++++++++++++++++
 .../packagegroup-meta-oe.bbappend             |  2 --
 .../packagegroups/packagegroup-meta-oe.bb     | 11 +++++-----
 3 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend
 rename meta-oe/{dynamic-layers/meta-python => }/recipes-core/packagegroups/packagegroup-meta-oe.bb (97%)
meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend new file +20 -0
new file mode 100644
index 0000000000..50da5e5d0d
@@ -0,0 +1,20 @@
+RDEPENDS_packagegroup-meta-oe-devtools += "\
+    python3-distutils-extra \
+    rwmem \
+    speedtest-cli \
+    mongodb \
+"
+
+RDEPENDS_packagegroup-meta-oe-connectivity += "\
+    lirc \
+"
+
+RDEPENDS_packagegroup-meta-oe-extended += "\
+    lcdproc \
+    mozjs \
+"
+RDEPENDS_packagegroup-meta-oe-support += "\
+    smem \
+"
+RDEPENDS_packagegroup-meta-oe-extended_remove_libc-musl = "lcdproc"
+
meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +0 -2
index e7b43204b6..69bc788a86 100644
@@ -1,3 +1 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
 RDEPENDS_packagegroup-meta-oe-support += "debsums"
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb renamed from meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb +5 -6
similarity index 97%
rename from meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bb
rename to meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index f4931aeeba..fabb45c88d 100644
@@ -62,7 +62,7 @@ RDEPENDS_packagegroup-meta-oe-benchmarks_remove_riscv32 = "libhugetlbfs"
 RDEPENDS_packagegroup-meta-oe-connectivity ="\
     gammu hostapd irssi krb5 libev libimobiledevice \
     libmbim libmtp libndp libqmi libtorrent \
-    libuv libwebsockets linuxptp lirc loudmouth \
+    libuv libwebsockets linuxptp loudmouth \
     modemmanager mosh  \
     paho-mqtt-c phonet-utils rabbitmq-c rfkill rtorrent \
     ser2net smstools3 telepathy-glib thrift \
@@ -115,7 +115,7 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\
     libubox log4cplus lshw ltrace lua mcpp memstat mercurial \
     mpich msgpack-c nlohmann-json openocd pax-utils \
     ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \
-    protobuf protobuf-c python3-distutils-extra \
+    protobuf protobuf-c \
     rapidjson serialcheck sip3 tclap uftrace uw-imap valijson \
     xmlrpc-c yajl yasm \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \
@@ -136,12 +136,12 @@ RDEPENDS_packagegroup-meta-oe-extended ="\
     byacc cfengine cfengine-masterfiles cmpi-bindings \
     ddrescue dialog dumb-init enscript fluentbit \
     haveged hexedit hiredis hplip hwloc indent iotop isomd5sum \
-    jansson konkretcmpi lcdproc libblockdev libcec libconfig \
+    jansson konkretcmpi libblockdev libcec libconfig \
     libdivecomputer libplist libusbmuxd \
     liblockfile liblogging liblognorm libmodbus libmodbus \
     libpwquality libqb libuio \
     lockfile-progs logwatch lprng mailx md5deep \
-    mozjs mraa nana nicstat \
+    mraa nana nicstat \
     p7zip p8platform libfile-fnmatch-perl \
     rarpd redis rrdtool libfastjson librelp rsyslog sanlock \
     sblim-cmpi-devel sblim-sfc-common sblim-sfcc \
@@ -163,7 +163,6 @@ RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64 = "upm mraa"
 RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc64le = "upm mraa"
 RDEPENDS_packagegroup-meta-oe-extended_remove_riscv64 = "upm mraa tiptop"
 RDEPENDS_packagegroup-meta-oe-extended_remove_riscv32 = "upm mraa tiptop"
-RDEPENDS_packagegroup-meta-oe-extended_remove_libc-musl = "lcdproc"
 
 RDEPENDS_packagegroup-meta-oe-gnome ="\
     atkmm gnome-common gnome-doc-utils-stub gtkmm \
@@ -256,7 +255,7 @@ RDEPENDS_packagegroup-meta-oe-support ="\
     pngcheck poco poppler poppler-data portaudio-v19 pps-tools \
     pv pxaregs raptor2 rdfind read-edid rsnapshot \
     satyr sdparm pty-forward-native serial-forward \
-    sg3-utils sharutils smem spitools srecord ssiapi stm32flash \
+    sg3-utils sharutils spitools srecord ssiapi stm32flash \
     syslog-ng system-config-keyboard tbb thin-provisioning-tools tokyocabinet \
     tree uhubctl unixodbc uriparser usb-modeswitch \
     usb-modeswitch-data uthash utouch-evemu utouch-frame \
Signature · 1 line
2.26.0