Skip to contentSkip to conversation

packagegroup: move "screenshot" util from amsdk to graphics packagegroup

RFC PATCH New Denys Dmytriyenko 1 participant 2 messages Nov 14, 2019

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/2 packagegroup: move "screenshot" util from amsdk to graphics packagegroup

From: Denys Dmytriyenko <[email protected]>

---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb   | 7 +------
 .../packagegroups/packagegroup-arago-tisdk-graphics.bb             | 5 ++++-
 2 files changed, 5 insertions(+), 7 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-amsdk.bb +1 -6
index 42c6aef..20ba84c 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Task to install additional packages only used in the Arago SDK"
 LICENSE = "MIT"
-PR = "r11"
+PR = "r12"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -17,11 +17,6 @@ OOBE_ti43x += "\
     parse-ip \
 "
 
-EXTRA_APPLICATIONS = "\
-    screenshot \
-"
-
 RDEPENDS_${PN} = "\
     ${OOBE} \
-    ${EXTRA_APPLICATIONS} \
 "
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-graphics.bb +4 -1
index f1a5ab6..420c628 100644
@@ -14,7 +14,10 @@ GFX_WAYLAND = "\
     wayland-ivi-extension \
 "
 
-GFX_UTILS = ""
+GFX_UTILS = "\
+    screenshot \
+"
+
 GFX_UTILS_append_omap-a15  = "\
     glsdk-util-scripts \
 "
Signature · 1 line
2.7.4
#1 lore raw

RFC PATCH 2/2 images: combine tisdk-rootfs-image with "server" and rename to tisdk-default-image

From: Denys Dmytriyenko <[email protected]>

---
 .../images/arago-core-tisdk-bundle.inc             |  6 +-----
 .../recipes-core/images/arago-image.inc            |  1 +
 ...isdk-rootfs-image.bb => tisdk-default-image.bb} | 14 ++++++++----
 .../images/tisdk-server-rootfs-image.bb            | 25 ----------------------
 4 files changed, 12 insertions(+), 34 deletions(-)
 rename meta-arago-distro/recipes-core/images/{tisdk-rootfs-image.bb => tisdk-default-image.bb} (66%)
 delete mode 100644 meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb
meta-arago-distro/recipes-core/images/arago-core-tisdk-bundle.inc +1 -5
index 7740467..1fae775 100644
@@ -32,15 +32,11 @@ DTB_FILTER_am65xx = "am65"
 DTB_FILTER_j7-evm = "j721e"
 
 # List of target side images to build for the SDK
-TARGET_IMAGES = "arago-base-tisdk-image tisdk-rootfs-image arago-tiny-image"
+TARGET_IMAGES = "arago-base-tisdk-image tisdk-default-image arago-tiny-image"
 
 # dra71 lcard requires an initramfs with modules for NFS boot
 TARGET_IMAGES_append_dra7xx-evm = " netboot-initrd"
 
-# Some devices do not support display and use a server image instead
-TARGET_IMAGES_keystone = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image"
-TARGET_IMAGES_omapl138 = "arago-base-tisdk-image tisdk-server-rootfs-image arago-tiny-image"
-
 TISDK_TOOLCHAIN = "meta-toolchain-arago-tisdk"
 TOOLCHAIN_SUFFIX = "-tisdk"
 
meta-arago-distro/recipes-core/images/arago-image.inc +1 -0
index b197dc2..e068287 100644
@@ -11,6 +11,7 @@ EXTRA_IMAGECMD_ext2.gz += "-i 4096"
 
 IMAGE_INSTALL = " \
 	packagegroup-core-boot \
+	${VIRTUAL-RUNTIME_initramfs} \
 	${CORE_IMAGE_EXTRA_INSTALL} \
 "
 
meta-arago-distro/recipes-core/images/tisdk-default-image.bb renamed from meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb +10 -4
similarity index 66%
rename from meta-arago-distro/recipes-core/images/tisdk-rootfs-image.bb
rename to meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index bb2515a..92f032a 100644
@@ -2,6 +2,8 @@
 
 require arago-image.inc
 
+SPLASH = "${@bb.utils.contains('MACHINE_FEATURES','gpu','psplash','',d)}"
+
 IMAGE_INSTALL += "\
     packagegroup-arago-base \
     packagegroup-arago-console \
@@ -10,7 +12,7 @@ IMAGE_INSTALL += "\
     packagegroup-arago-test-addons \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-graphics','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-gtk','',d)} \
-    packagegroup-arago-tisdk-qte \
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-qte','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
     ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
     packagegroup-arago-tisdk-connectivity \
@@ -21,7 +23,11 @@ IMAGE_INSTALL += "\
     packagegroup-arago-tisdk-amsdk \
     packagegroup-arago-tisdk-addons \
     packagegroup-arago-tisdk-addons-extra \
-    packagegroup-arago-tisdk-hmi \
-    "
+    ${@bb.utils.contains('MACHINE_FEATURES','gpu','packagegroup-arago-tisdk-hmi','packagegroup-arago-base-tisdk-server-extra',d)} \
+"
+
+export IMAGE_BASENAME = "tisdk-default-image"
 
-export IMAGE_BASENAME = "tisdk-rootfs-image"
+# Disable ubi/ubifs as the filesystem requires more space than is
+# available on the HW.
+IMAGE_FSTYPES_remove = "ubifs ubi"
meta-arago-distro/recipes-core/images/tisdk-server-rootfs-image.bb deleted +0 -25
deleted file mode 100644
index 7c52e39..0000000
@@ -1,25 +0,0 @@
-# Arago TI SDK filesystem image
-
-require arago-base-tisdk-image.bb
-
-SPLASH = ""
-
-IMAGE_INSTALL += "\
-    packagegroup-arago-tisdk-addons \
-    packagegroup-arago-tisdk-addons-extra \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl','',d)} \
-    ${@bb.utils.contains('MACHINE_FEATURES','dsp','packagegroup-arago-tisdk-opencl-extra','',d)} \
-    packagegroup-arago-tisdk-crypto \
-    packagegroup-arago-tisdk-multimedia \
-    packagegroup-arago-tisdk-matrix \
-    packagegroup-arago-tisdk-matrix-extra \
-    packagegroup-arago-base-tisdk-server-extra \
-    packagegroup-arago-tisdk-connectivity \
-    packagegroup-arago-test-addons \
-"
-
-export IMAGE_BASENAME = "tisdk-server-rootfs-image"
-
-# Disable ubi/ubifs as the filesystem requires more space than is
-# available on the HW.
-IMAGE_FSTYPES_remove = "ubifs ubi"
Signature · 1 line
2.7.4