Skip to contentSkip to conversation

matrix-lighttpd-config: properly defer postinst to run on target

PATCH New Denys Dmytriyenko 1 participant 6 messages Sep 13, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 matrix-lighttpd-config: properly defer postinst to run on target

---
 meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arago-extras/recipes-core/matrix/matrix-lighttpd-config.bb +1 -1
index f47b0e0..096b5ad 100644
@@ -22,7 +22,7 @@ do_install() {
 FILES_${PN} = "${sysconfdir}/lighttpd.conf.matrix"
 RDEPENDS_${PN} = "lighttpd lighttpd-module-setenv"
 
-pkg_postinst_${PN} () {
+pkg_postinst_ontarget_${PN} () {
 if [ -f $D${sysconfdir}/lighttpd.conf ] ; then
 	cp $D${sysconfdir}/lighttpd.conf.matrix $D${sysconfdir}/lighttpd.conf
 else
Signature · 1 line
2.7.4
#1 lore raw

PATCH 2/6 HACK: weston: revert EGL_KHR_partial_update changes that require EGL 1.5

---
 ...renderer-Add-EGL_EXT_partial_update-query.patch | 47 ++++++++++++++++++++
 ...l-renderer-Support-EGL_KHR_partial_update.patch | 51 ++++++++++++++++++++++
 .../recipes-graphics/wayland/weston_7.0.0.bbappend |  7 ++-
 3 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-gl-renderer-Add-EGL_EXT_partial_update-query.patch
 create mode 100644 meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-gl-renderer-Support-EGL_KHR_partial_update.patch
meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-gl-renderer-Add-EGL_EXT_partial_update-query.patch new file +47 -0
new file mode 100644
index 0000000..556440e
@@ -0,0 +1,47 @@
+From e9ce4695a1ea78434b7244705ef3fd2af7b360f7 Mon Sep 17 00:00:00 2001
+From: Denys Dmytriyenko <[email protected]>
+Date: Thu, 12 Sep 2019 21:03:18 -0400
+Subject: [PATCH] Revert "gl-renderer: Add EGL_EXT_partial_update query"
+
+This reverts commit 0a86a81cc251330b15e213fde8434f291e35bf88.
+
+Signed-off-by: Denys Dmytriyenko <[email protected]>
+---
+ libweston/renderer-gl/gl-renderer.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
+index 6c2a56d..590ef09 100644
+--- a/libweston/renderer-gl/gl-renderer.c
++++ b/libweston/renderer-gl/gl-renderer.c
+@@ -233,8 +233,6 @@ struct gl_renderer {
+ 	bool has_egl_image_external;
+ 
+ 	bool has_egl_buffer_age;
+-	bool has_egl_partial_update;
+-	PFNEGLSETDAMAGEREGIONKHRPROC set_damage_region;
+ 
+ 	bool has_configless_context;
+ 
+@@ -3515,8 +3513,6 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
+ 		(void *) eglGetProcAddress("eglUnbindWaylandDisplayWL");
+ 	gr->query_buffer =
+ 		(void *) eglGetProcAddress("eglQueryWaylandBufferWL");
+-	gr->set_damage_region =
+-		(void *) eglGetProcAddress("eglSetDamageRegionKHR");
+ 
+ 	extensions =
+ 		(const char *) eglQueryString(gr->egl_display, EGL_EXTENSIONS);
+@@ -3539,9 +3535,6 @@ gl_renderer_setup_egl_extensions(struct weston_compositor *ec)
+ 	if (weston_check_egl_extension(extensions, "EGL_EXT_buffer_age"))
+ 		gr->has_egl_buffer_age = true;
+ 
+-	if (weston_check_egl_extension(extensions, "EGL_KHR_partial_update"))
+-		gr->has_egl_partial_update = true;
+-
+ 	for (i = 0; i < ARRAY_LENGTH(swap_damage_ext_to_entrypoint); i++) {
+ 		if (weston_check_egl_extension(extensions,
+ 				swap_damage_ext_to_entrypoint[i].extension)) {
+-- 
+2.7.4
+
meta-arago-distro/recipes-graphics/wayland/weston/0001-Revert-gl-renderer-Support-EGL_KHR_partial_update.patch new file +51 -0

51 lines not on this page · raw message

meta-arago-distro/recipes-graphics/wayland/weston_7.0.0.bbappend +5 -2
index 5e15bb6..c37dbee 100644
@@ -1,12 +1,15 @@
 PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/libgbm mtdev"
 
-PR_append = ".arago34"
+PR_append = ".arago0"
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 RDEPENDS_${PN} += "weston-conf"
 
-#SRC_URI += " \
+SRC_URI += " \
+        file://0001-Revert-gl-renderer-Add-EGL_EXT_partial_update-query.patch \
+        file://0001-Revert-gl-renderer-Support-EGL_KHR_partial_update.patch \
+"
 #        file://0002-weston-Allow-visual_id-to-be-0.patch \
 #        file://0003-weston-Fix-virtual-keyboard-display-issue-for-QT5-ap.patch \
 #        file://0004-weston-Fix-touch-screen-crash-issue.patch \
Signature · 1 line
2.7.4
#2 lore raw

PATCH 3/6 HACK: packagegroup-*-opencl: disable ti-fftw for now

In reply to Denys Dmytriyenko
---
 .../recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-opencl.bb +2 -2
index dfd8555..c1ef8ae 100644
@@ -19,16 +19,16 @@ EXTRA_PKGS = " \
     python-pyopencl \
 "
 
+#    ti-fftw-examples
 EXTRA_PKGS_append_k2hk = " \
     linalg-examples \
-    ti-fftw-examples \
 "
 
+#    ti-fftw-examples
 EXTRA_PKGS_append_dra7xx = " \
     linalg-examples \
     opencl-examples \
     kaldi \
-    ti-fftw-examples \
 "
 
 RDEPENDS_${PN} = "\
Signature · 1 line
2.7.4
#3 lore raw

PATCH 4/6 HACK: libdrm: disable local test patch, as it requires rebasing

In reply to Denys Dmytriyenko
---
 meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-arago-distro/recipes-graphics/drm/libdrm_%.bbappend +2 -1
index 99d2fa7..2624319 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
+# file://0001-Add-option-to-run-a-test-indefinitely.patch
+
 SRC_URI += " \
-file://0001-Add-option-to-run-a-test-indefinitely.patch \
 file://0001-omap-fix-omap_bo_size-for-tiled-buffers.patch \
 file://0002-omap-add-OMAP_BO-flags-to-affect-buffer-allocation.patch \
 file://0001-libsync-add-support-for-pre-v4.7-kernels.patch \
Signature · 1 line
2.7.4
#4 lore raw

PATCH 5/6 HACK: qtbase: mangle local eglfs_kms patch to apply on 5.13

In reply to Denys Dmytriyenko
---
 ...ins-platforms-eglfs_kms-fix-compiler-erro.patch | 28 ----------------------
 meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend |  3 ++-
 2 files changed, 2 insertions(+), 29 deletions(-)
meta-arago-distro/recipes-qt/qt5/qtbase/0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch +0 -28
index cbedfc0..16006aa 100644
@@ -15,18 +15,6 @@ diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgb
 index 4023381..eb24175 100644
 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
 +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.cpp
-@@ -61,11 +61,6 @@ QEglFSKmsGbmIntegration::QEglFSKmsGbmIntegration()
-     qCDebug(qLcEglfsKmsDebug, "New DRM/KMS via GBM integration created");
- }
- 
--#ifndef EGL_EXT_platform_base
--typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
--typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
--#endif
--
- #ifndef EGL_PLATFORM_GBM_KHR
- #define EGL_PLATFORM_GBM_KHR 0x31D7
- #endif
 @@ -83,7 +78,7 @@ EGLDisplay QEglFSKmsGbmIntegration::createDisplay(EGLNativeDisplayType nativeDis
      }
  
@@ -36,22 +24,6 @@ index 4023381..eb24175 100644
      } else {
          qCDebug(qLcEglfsKmsDebug, "No eglGetPlatformDisplay for GBM, falling back to eglGetDisplay");
          display = eglGetDisplay(nativeDisplay);
-diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
-index 71f232a..6467a21 100644
---- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
-+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmintegration.h
-@@ -48,6 +48,11 @@
- 
- QT_BEGIN_NAMESPACE
- 
-+#ifndef EGL_EXT_platform_base
-+typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list);
-+typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMWINDOWSURFACEEXTPROC) (EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
-+#endif
-+
- class QEglFSKmsDevice;
- 
- class QEglFSKmsGbmIntegration : public QEglFSKmsIntegration
 -- 
 1.9.1
 
meta-arago-distro/recipes-qt/qt5/qtbase_%.bbappend +2 -1
index 6056b9e..88fea3b 100644
@@ -14,10 +14,11 @@ QT_EGLFS_PATCHES = "\
     file://quit.png \
 "
 
+#    file://0002-deform-disable-opengl-button.patch
+
 SRC_URI += "\
     ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
     file://0001-deform-Fix-how-controls-are-shown.patch \
-    file://0002-deform-disable-opengl-button.patch \
     file://0001-qtbase-plugins-platforms-eglfs_kms-fix-compiler-erro.patch \
 "
 
Signature · 1 line
2.7.4
#5 lore raw

PATCH 6/6 HACK: recipes: skip wl18xx and crypto examples due to OpenSSL 1.0 deprecation

In reply to Denys Dmytriyenko
---
 meta-arago-distro/conf/distro/include/arago-prefs.inc  |  6 +++---
 ...packagegroup-arago-tisdk-connectivity-sdk-target.bb |  4 ++--
 .../packagegroup-arago-tisdk-connectivity.bb           |  4 ++--
 .../packagegroup-arago-tisdk-crypto-sdk-host.bb        |  6 +++---
 .../packagegroups/packagegroup-arago-tisdk-crypto.bb   | 11 +++++------
 .../recipes-connectivity/hostap/hostap.inc             |  2 +-
 .../recipes-connectivity/vtun/vtun_3.0.3.bb            |  2 +-
 .../wpa-supplicant/wpa-supplicant.inc                  |  2 +-
 .../recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb | 18 ++++++------------
 .../ti-crypto-examples/ti-crypto-examples_git.bb       |  6 +++++-
 10 files changed, 29 insertions(+), 32 deletions(-)
meta-arago-distro/conf/distro/include/arago-prefs.inc +3 -3
index 3d2ad74..f34fc65 100644
@@ -49,6 +49,6 @@ PREFERRED_VERSION_obex = "0.34"
 PREFERRED_PROVIDER_libnl-xfrm = "libnl"
 
 PREFERRED_PROVIDER_wpa-supplicant = "wpa-supplicant"
-PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
-PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
-PREFERRED_PROVIDER_wpa-supplicant_omap-a15 = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
+#PREFERRED_PROVIDER_wpa-supplicant_omap-a15 = "wpa-supplicant-wl18xx"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity-sdk-target.bb +2 -2
index 3380913..cdf6a62 100644
@@ -13,12 +13,12 @@ BLUETOOTH_STACK = "\
 CONNECTIVITY_RDEPENDS = ""
 
 CONNECTIVITY_RDEPENDS_ti33x  = "\
-    wpa-supplicant-wl18xx-dev \
+    wpa-supplicant-dev \
     ${BLUETOOTH_STACK} \
 "
 
 CONNECTIVITY_RDEPENDS_ti43x  = "\
-    wpa-supplicant-wl18xx-dev \
+    wpa-supplicant-dev \
     ${BLUETOOTH_STACK} \
 "
 
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb +2 -2
index cc7da73..f3938ac 100644
@@ -19,8 +19,8 @@ WLAN_COMMON = "\
 "
 
 WLAN_TI = "\
-    wpa-supplicant-wl18xx \
-    hostap-daemon-wl18xx \
+    wpa-supplicant \
+    hostapd \
     wl18xx-calibrator \
     wl18xx-target-scripts \
     wl18xx-fw \
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto-sdk-host.bb +3 -3
index e87d8c2..14c06e9 100644
@@ -8,9 +8,9 @@ inherit packagegroup
 
 CRYPTO_RDEPENDS = ""
 
-CRYPTO_RDEPENDS_append_ti33x = " ti-crypto-examples-src"
-CRYPTO_RDEPENDS_append_ti43x = " ti-crypto-examples-src"
-CRYPTO_RDEPENDS_append_keystone = " ti-crypto-examples-src"
+#CRYPTO_RDEPENDS_append_ti33x = " ti-crypto-examples-src"
+#CRYPTO_RDEPENDS_append_ti43x = " ti-crypto-examples-src"
+#CRYPTO_RDEPENDS_append_keystone = " ti-crypto-examples-src"
 
 CRYPTO_RDEPENDS_append_ti33x = " cryptodev-module-src"
 CRYPTO_RDEPENDS_append_ti43x = " cryptodev-module-src"
meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-crypto.bb +5 -6
index 4fe7057..50b7e8e 100644
@@ -11,14 +11,13 @@ CRYPTO_SUPPORT = "\
     openssl-bin \
     openssl-conf \
     openssl-engines \
-    openssl10 \
-    openssl10-engines \
 "
 
-CRYPTO_SUPPORT_append_ti33x = " ti-crypto-examples cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_ti43x = " ti-crypto-examples cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_dra7xx = " ti-crypto-examples cryptodev-module cryptodev-tests"
-CRYPTO_SUPPORT_append_keystone = " ti-crypto-examples cryptodev-module cryptodev-tests"
+#ti-crypto-examples
+CRYPTO_SUPPORT_append_ti33x = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT_append_ti43x = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT_append_dra7xx = " cryptodev-module cryptodev-tests"
+CRYPTO_SUPPORT_append_keystone = " cryptodev-module cryptodev-tests"
 
 RDEPENDS_${PN} = "\
     ${CRYPTO_SUPPORT} \
meta-arago-extras/recipes-connectivity/hostap/hostap.inc +1 -1
index f58a3dc..324de0b 100644
@@ -5,7 +5,7 @@ HOMEPAGE = "http://hostap.epitest.fi"
 DESCRIPTION = "User space daemon for extended IEEE 802.11 management"
 SECTION = "kernel/userland"
 
-DEPENDS = "libnl openssl10"
+DEPENDS = "libnl openssl"
 
 # Since this is a TI customized version of hostap-daemon do not make this the
 # default
meta-arago-extras/recipes-connectivity/vtun/vtun_3.0.3.bb +1 -1
index 50e4d23..4450cc1 100644
@@ -4,7 +4,7 @@ SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://vtun.h;startline=1;endline=17;md5=9ac9e7fefca60c72400239e0de40cde8"
 
-DEPENDS = "zlib lzo openssl10 bison-native flex-native"
+DEPENDS = "zlib lzo openssl bison-native flex-native"
 
 SRC_URI = "http://downloads.sourceforge.net/project/vtun/vtun/${PV}/vtun-${PV}.tar.gz"
 
meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc +1 -1
index 5fc3e58..6aac06d 100644
@@ -9,7 +9,7 @@ LICENSE = "GPLv2 | BSD"
 
 inherit pkgconfig
 
-DEPENDS = "gnutls dbus libnl openssl10 libgcrypt"
+DEPENDS = "gnutls dbus libnl openssl libgcrypt"
 RRECOMMENDS_${PN} = "wpa-supplicant-passphrase wpa-supplicant-cli"
 
 # To prevent users from accidently picking up this customized version of
meta-arago-extras/recipes-core/matrix/matrix-gui-crypto-demos_2.0.bb +6 -12
index 99cf9c9..5ed3705 100644
@@ -13,18 +13,12 @@ S_ti43x = "${WORKDIR}/git/cryptos_apps_program"
 S_dra7xx = "${WORKDIR}/git/cryptos_apps_program"
 S_keystone = "${WORKDIR}/git/cryptos_apps_program"
 
-# These scripts HW offloading, so use openssl 1.0
-OPENSSL_BIN = "/usr/bin/openssl10"
-do_configure() {
-    sed -i -e "s|^OPENSSL=.*|OPENSSL=${OPENSSL_BIN}|" ${S}/openssl_perf_scripts/openssl_perf.sh
-}
-
 FILES_${PN} += "${MATRIX_BASE_DIR}/*"
 
-# Make sure crypto submenu and app images has been installed. Also make sure openssl10 is available
-RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl10 matrix-gui-helper-scripts"
+# Make sure crypto submenu and app images has been installed. Also make sure openssl is available
+RDEPENDS_${PN} += "matrix-gui-apps-images matrix-gui-submenus-cryptos openssl matrix-gui-helper-scripts"
 
-RDEPENDS_${PN}_append_ti33x = " ti-crypto-examples"
-RDEPENDS_${PN}_append_ti43x = " ti-crypto-examples"
-RDEPENDS_${PN}_append_dra7xx = " ti-crypto-examples"
-RDEPENDS_${PN}_append_keystone = " ti-crypto-examples"
+#RDEPENDS_${PN}_append_ti33x = " ti-crypto-examples"
+#RDEPENDS_${PN}_append_ti43x = " ti-crypto-examples"
+#RDEPENDS_${PN}_append_dra7xx = " ti-crypto-examples"
+#RDEPENDS_${PN}_append_keystone = " ti-crypto-examples"
meta-arago-extras/recipes-core/ti-crypto-examples/ti-crypto-examples_git.bb +5 -1
index 3df6275..3cfa332 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://arago-project.org/git/projects/?p=crypto-example-apps.git;a=s
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://AES/aes_256.c;beginline=9;endline=35;md5=8edbb4dee965d2f2eb5ca2822addcae5"
 SECTION = "console"
-DEPENDS += "openssl10"
+DEPENDS += "openssl"
 
 PR = "r7"
 
@@ -24,3 +24,7 @@ do_compile() {
 do_install() {
     oe_runmake DESTDIR=${D} install
 }
+
+python () {
+    raise bb.parse.SkipRecipe("skipping ti-crypto-examples")
+}
Signature · 1 line
2.7.4