diff options
author | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
---|---|---|
committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2020-02-21 16:37:55 +0100 |
commit | df4ed283e18f3dfe9f42f0012b12cb0af57bcdbb (patch) | |
tree | 40ad4b148e24c47d319bbbd23bbfc4af75a36e94 /meta-security/recipes-security | |
parent | d40e55dbb362c455f0ee863b23c21ac2628cf3f8 (diff) | |
parent | 47aa65ba73e1b29459171de24fb0ee0040cbb39c (diff) |
Merge remote-tracking branch 'agl/next'
* agl/next:
meta-agl-bsp: Add CONFIG_LSM workaround for 5.1+ kernels
meta-agl-profile-cluster-qt5: disable qtbase patches
zeus updates for dragonboard-410c
meta-security: activates dbus-cynagora
recipes-graphics/wayland/weston: Expose weston_output_damage()
meta-agl-profile-core: tweak udisks2 configuration for AGL
meta-agl-bsp/meta-arago: update weston bbappend
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Update rcar driver weston 7 bsp 3.21.0
[RCAR] Split ADSP path for ulcb and ulcb-kf
Fix nss-localuser post install
meta-agl-bsp: meta-raspberrypi: handle zeus upgrade
meta-agl-profile-core: add patch for systemd-udevd SECLABEL crash
meta-security: disable dbus-cynara patches
meta-agl-bsp: handle ptest-runner upgrade
meta-agl-distro: Add inc file for next branch over-rides
meta-agl-distro: BBMASK problematic upstream meta-security bbappend
meta-agl-distro: prefer linux-yocto 4.19 LTS kernel
meta-agl-profile-graphical-qt5: enable qt5location services
meta-agl-profile-core: update most recipe
meta-agl-profile-core: update neardal recipe
Update base local.conf.sample
meta-agl-profile-graphical: don't always build agl-compositor
meta-agl-profile-graphical: update weston and weston-init
meta-agl-profile-graphical: update wayland-ivi-extension for weston 7.0.0
meta-agl-distro: add polkit to DISTRO_FEATURES
meta-agl-profile-core: update fontconfig bbappend
meta-agl-profile-core: switch to udisks2
meta-security: handle systemd upgrade
meta-agl-profile-graphical-qt5: handle qtwayland upgrade
meta-agl-profile-core: handle freetype upgrade
meta-agl-bsp meta-agl-profile-core: upgrade to opencv 4.x
meta-agl-profile-core: update rtl-sdr recipe for zeus
meta-security meta-app-framework: handle xmlsec1 upgrade
meta-agl-profile-graphical: upgrade to gstreamer 1.16
meta-agl-profile-core: remove libmicrohttpd backport
meta-agl-profile-core: remove backported curl and nghttp2 recipes
meta-agl-profile-core: remove libnfc recipe
meta-agl-profile-core: remove connman backport
meta-agl-profile-graphical: remove weston 5.0.0 patches
meta-agl-profile-core: remove old glibc patch
meta-agl-bsp/meta-intel: remove linux-firmware_git.bbappend
meta-agl-bsp: remove weston and wayland-protocols backports
meta-app-framework: remove libzip recipe
meta-security: remove keyutils recipe
Declare layer compatibility with zeus
Change-Id: Ie8ee1e37958279e7cf2d503c54ffacb46ba0c31c
Diffstat (limited to 'meta-security/recipes-security')
6 files changed, 0 insertions, 122 deletions
diff --git a/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch deleted file mode 100644 index a049fd23f..000000000 --- a/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: keyutils-1.5.5/Makefile -=================================================================== ---- keyutils-1.5.5.orig/Makefile 2011-12-20 11:05:10.000000000 +0200 -+++ keyutils-1.5.5/Makefile 2011-12-20 11:06:27.000000000 +0200 -@@ -58,12 +58,12 @@ - LNS := ln -sf - - ifeq ($(BUILDFOR),32-bit) --CFLAGS += -m32 -+#CFLAGS += -m32 - LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - else - ifeq ($(BUILDFOR),64-bit) --CFLAGS += -m64 -+#CFLAGS += -m64 - LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - endif diff --git a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch deleted file mode 100644 index adf064304..000000000 --- a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: keyutils-1.5.5/Makefile -=================================================================== ---- keyutils-1.5.5.orig/Makefile 2011-11-30 17:27:43.000000000 +0200 -+++ keyutils-1.5.5/Makefile 2011-12-21 16:05:53.000000000 +0200 -@@ -59,13 +59,13 @@ - - ifeq ($(BUILDFOR),32-bit) - CFLAGS += -m32 --LIBDIR := /lib -+LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - else - ifeq ($(BUILDFOR),64-bit) - CFLAGS += -m64 --LIBDIR := /lib64 --USRLIBDIR := /usr/lib64 -+LIBDIR := /usr/lib -+USRLIBDIR := /usr/lib - endif - endif - -@@ -152,7 +152,7 @@ - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key - $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh diff --git a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch deleted file mode 100644 index 8dd224505..000000000 --- a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/Makefile -=================================================================== ---- git.orig/Makefile 2012-11-16 15:40:05.258723425 +0200 -+++ git/Makefile 2012-11-16 15:41:08.978725491 +0200 -@@ -53,7 +53,7 @@ - ############################################################################### - LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 64-bit - - LNS := ln -sf - diff --git a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch deleted file mode 100644 index 573c429b8..000000000 --- a/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/Makefile -=================================================================== ---- git.orig/Makefile 2012-11-16 15:40:05.258723425 +0200 -+++ git/Makefile 2012-11-16 15:41:08.978725491 +0200 -@@ -53,7 +53,7 @@ - ############################################################################### - LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 32-bit - - LNS := ln -sf - diff --git a/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb b/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb deleted file mode 100644 index 46b2b622a..000000000 --- a/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb +++ /dev/null @@ -1,44 +0,0 @@ -SUMMARY = "Linux Key Management Utilities" -DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \ -facility in the kernel, which can be used by filesystems, block devices and \ -more to gain and retain the authorization and encryption keys required to \ -perform secure operations." -SECTION = "base" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45" - -PR = "r1" - -SRCREV = "dd64114721edca5808872190e7e2e927ee2e994c" - -SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ - file://keyutils_fix_library_install.patch \ - " -SRC_URI_append_arm = " file://keyutils-arm-remove-m32-m64.patch" -SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch" -SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch" - -S = "${WORKDIR}/git" - -INSTALL_FLAGS = " \ -BINDIR=${bindir} \ -SBINDIR=${sbindir} \ -INCLUDEDIR=${includedir} \ -ETCDIR=${sysconfdir} \ -LIBDIR=${libdir} \ -USRLIBDIR=${libdir} \ -SHAREDIR=${datadir} \ -MAN1=${mandir}/man1 \ -MAN3=${mandir}/man3 \ -MAN5=${mandir}/man5 \ -MAN8=${mandir}/man8 \ -DESTDIR=${D}" - -do_install() { - cd ${S} && oe_runmake ${INSTALL_FLAGS} install - - # Debugging script of unknown value, not packaged. - rm -f "${D}${datadir}/request-key-debug.sh" -} - -BBCLASSEXTEND = "native" diff --git a/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend b/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend deleted file mode 100644 index 9c6080fcf..000000000 --- a/meta-security/recipes-security/xmlsec1/xmlsec1_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# remove the EXTRA_OECONF from the recipe to -# avoid an build error in >= YP SUMO -EXTRA_OECONF = "" |