diff --git a/conf/distro/nilrt.inc b/conf/distro/nilrt.inc index 610606135..dc968620c 100644 --- a/conf/distro/nilrt.inc +++ b/conf/distro/nilrt.inc @@ -69,8 +69,6 @@ OLDEST_KERNEL = "3.14.3" QTDEMOS = "quicky fotowall" -GCCVERSION = "7.3%" - EFI_PROVIDER = "grub-efi" INCLUDE_PYCS = "0" diff --git a/recipes-bsp/u-boot/files/0001-Remove-hardcoded-softfp-from-arm-makefile.patch b/recipes-bsp/u-boot/files/0001-Remove-hardcoded-softfp-from-arm-makefile.patch deleted file mode 100644 index 43b5cc3b0..000000000 --- a/recipes-bsp/u-boot/files/0001-Remove-hardcoded-softfp-from-arm-makefile.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bfc8c771609d73585a89c4f3d08e98dc667ddad0 Mon Sep 17 00:00:00 2001 -From: Arnold Csorvasi -Date: Fri, 18 Dec 2015 15:50:52 +0200 -Subject: [PATCH] Remove hardcoded softfp from arm makefile. - -Upstream-Status: N/A - -Signed-off-by: Arnold Csorvasi ---- - arch/arm/cpu/armv7/config.mk | 2 +- - arch/arm/cpu/armv7/zynq/config.mk | 3 +-- - 2 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk -index 560c084..5b35c71 100644 ---- a/arch/arm/cpu/armv7/config.mk -+++ b/arch/arm/cpu/armv7/config.mk -@@ -20,7 +20,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, - # MA 02111-1307 USA - # --PLATFORM_RELFLAGS += -fno-common -ffixed-r8 -msoft-float -+PLATFORM_RELFLAGS += -fno-common -ffixed-r8 - - # If armv7-a is not supported by GCC fall-back to armv5, which is - # supported by more tool-chains -diff --git a/arch/arm/cpu/armv7/zynq/config.mk b/arch/arm/cpu/armv7/zynq/config.mk -index 541c73d..0f7516f 100644 ---- a/arch/arm/cpu/armv7/zynq/config.mk -+++ b/arch/arm/cpu/armv7/zynq/config.mk -@@ -20,8 +20,7 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, - # MA 02111-1307 USA - # --PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 \ -- -msoft-float -+PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -ffixed-r8 - - PLATFORM_CPPFLAGS += -march=armv7-a - PLATFORM_CPPFLAGS += -I$(TOPDIR)/board/xilinx/common --- -2.1.4 - diff --git a/recipes-bsp/u-boot/files/0001-gcc5-backport-add-compiler-gcc5.h.patch b/recipes-bsp/u-boot/files/0001-gcc5-backport-add-compiler-gcc5.h.patch deleted file mode 100644 index 12db94ca1..000000000 --- a/recipes-bsp/u-boot/files/0001-gcc5-backport-add-compiler-gcc5.h.patch +++ /dev/null @@ -1,91 +0,0 @@ -Upstream-Status: Backport - -From 478b02f1a7043b673565075ea5016376f3293b23 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Sat, 7 Feb 2015 22:52:40 +0100 -Subject: [PATCH] Add linux/compiler-gcc5.h to fix builds with gcc5 - -Add linux/compiler-gcc5/h from the kernel sources at: - -commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b -Author: Steven Noonan -Date: Sat Oct 25 15:09:42 2014 -0700 - - compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles - -Signed-off-by: Hans de Goede ---- - include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc5.h - -Index: git/include/linux/compiler-gcc5.h -=================================================================== ---- /dev/null -+++ git/include/linux/compiler-gcc5.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ diff --git a/recipes-bsp/u-boot/files/0002-gcc5-use-gcc-inline-version-instead-c99.patch b/recipes-bsp/u-boot/files/0002-gcc5-use-gcc-inline-version-instead-c99.patch deleted file mode 100644 index a89ca926d..000000000 --- a/recipes-bsp/u-boot/files/0002-gcc5-use-gcc-inline-version-instead-c99.patch +++ /dev/null @@ -1,58 +0,0 @@ -Upstream-Status: Not Upstreamable - -[U-Boot] [RFC 08/10] inline: use the gcc inline version instead of the c99 one. - -Jeroen Hofstee jeroen at myspectrum.nl -Sat May 31 22:32:22 CEST 2014 -Previous message: [U-Boot] [RFC 07/10] ARM: make gd a function a function for clang -Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] ---- -This fixes errors like: - -make[1]: Entering directory `/home/jeroen/software/u-boot/arch/arm/cpu/armv7/omap-common' -arm-linux-gnueabi-ld.bfd -r -o libomap-common.o reset.o timer.o utils.o -timer.o: In function `get_tbclk': -/home/jeroen/software/u-boot/include/asm/io.h:81: multiple definition of `__raw_writesb' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:81: first defined here -timer.o: In function `__udelay': -/home/jeroen/software/u-boot/include/asm/io.h:88: multiple definition of `__raw_writesw' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:88: first defined here -timer.o: In function `get_ticks': -/home/jeroen/software/u-boot/include/asm/io.h:95: multiple definition of `__raw_writesl' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:95: first defined here -timer.o: In function `__raw_readsb': -/home/jeroen/software/u-boot/include/asm/io.h:102: multiple definition of `__raw_readsb' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:102: first defined here -timer.o: In function `__raw_readsw': -/home/jeroen/software/u-boot/include/asm/io.h:109: multiple definition of `__raw_readsw' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:109: first defined here -timer.o: In function `__raw_readsl': -/home/jeroen/software/u-boot/include/asm/io.h:116: multiple definition of `__raw_readsl' -reset.o:/home/jeroen/software/u-boot/include/asm/io.h:116: first defined here -make[1]: *** [libomap-common.o] Error 1 -make[1]: Leaving directory `/home/jeroen/software/u-boot/arch/arm/cpu/armv7/omap-common' -make: *** [arch/arm/cpu/armv7/omap-common/libomap-common.o] Error 2 ---- - include/linux/compiler-gcc.h | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h -index 9896e54..99c6dcc 100644 ---- a/include/linux/compiler-gcc.h -+++ b/include/linux/compiler-gcc.h -@@ -44,9 +44,10 @@ - */ - #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ - !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) --# define inline inline __attribute__((always_inline)) --# define __inline__ __inline__ __attribute__((always_inline)) --# define __inline __inline __attribute__((always_inline)) -+/* XXX: check __GNUC_STDC_INLINE__, fix line length */ -+# define inline inline __attribute__((always_inline)) __attribute__((__gnu_inline__)) -+# define __inline__ __inline__ __attribute__((always_inline)) __attribute__((__gnu_inline__)) -+# define __inline __inline __attribute__((always_inline)) __attribute__((__gnu_inline__)) - #endif - - #define __deprecated __attribute__((deprecated)) --- -1.8.3.2 diff --git a/recipes-bsp/u-boot/files/0003-gcc5-include-io.h-needs-inline-def-from-compiler-gcc.h.patch b/recipes-bsp/u-boot/files/0003-gcc5-include-io.h-needs-inline-def-from-compiler-gcc.h.patch deleted file mode 100644 index 35dbabb3a..000000000 --- a/recipes-bsp/u-boot/files/0003-gcc5-include-io.h-needs-inline-def-from-compiler-gcc.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -Upstream-Status: Not Upstreamable - -From fa23bfa1ca6ef105cb54dfe6a8e1ff09c287bfa8 Mon Sep 17 00:00:00 2001 -From: Ovidiu-Adrian Vancea -Date: Thu, 1 Sep 2016 14:57:31 +0300 -Subject: [PATCH] include: io.h needs inline def from compiler-gcc.h - -io.h fails to compile without inline definition from compiler-gcc.h but will -complain if directly includes it. Use compiler.h which includes compiler-gcc.h - -Signed-off-by: Ovidiu-Adrian Vancea ---- - arch/arm/include/asm/io.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h -index 1fbc531..144d9f4 100644 ---- a/arch/arm/include/asm/io.h -+++ b/arch/arm/include/asm/io.h -@@ -28,6 +28,7 @@ - #if 0 /* XXX###XXX */ - #include - #endif /* XXX###XXX */ -+#include - - static inline void sync(void) - { --- -2.7.4 - diff --git a/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch b/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch deleted file mode 100644 index 18c5e7488..000000000 --- a/recipes-bsp/u-boot/files/fix-build-error-under-gcc6.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 07373b2e477ae61f9f6a0e2eff41be3276d92923 Mon Sep 17 00:00:00 2001 -From: yocto -Date: Thu, 2 Jun 2016 03:21:51 -0500 -Subject: [PATCH] fix build error under gcc6 - -Fix the following error: -| ../include/linux/compiler-gcc.h:114:30: fatal error: linux/compiler-gcc6.h: No such file or directory -| #include gcc_header(__GNUC__) - -Signed-off-by: Zhenhua Luo - -Upstream-Status: Pending ---- - include/linux/compiler-gcc6.h | 65 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 65 insertions(+) - create mode 100644 include/linux/compiler-gcc6.h - -diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h -new file mode 100644 -index 0000000..c8c5659 ---- /dev/null -+++ b/include/linux/compiler-gcc6.h -@@ -0,0 +1,65 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.5.0 - diff --git a/recipes-bsp/u-boot/files/fix-build-error-under-gcc7.patch b/recipes-bsp/u-boot/files/fix-build-error-under-gcc7.patch deleted file mode 100644 index c901fed13..000000000 --- a/recipes-bsp/u-boot/files/fix-build-error-under-gcc7.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 81ae0fca9b92cb9e02568a5777f83d8b8eb69104 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Tue, 20 Jun 2017 13:25:20 -0400 -Subject: [PATCH] fix build for gcc7 - -| In file included from .../include/linux/compiler.h:54:0, -| from .../include/uapi/linux/stddef.h:1, -| from .../include/linux/stddef.h:4, -| from .../include/uapi/linux/posix_types.h:4, -| from .../include/uapi/linux/types.h:13, -| from .../include/linux/types.h:5, -| from .../include/linux/mod_devicetable.h:11, -| from .../scripts/mod/devicetable-offsets.c:2: -| .../include/linux/compiler-gcc.h:121:1: fatal error: linux/compiler-gcc7.h: No such file or directory -| #include gcc_header(__GNUC__) - -Upstream-Status: Pending - -Signed-off-by: Trevor Woerner -Signed-off-by: Fabio Berton ---- - include/linux/compiler-gcc7.h | 66 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 66 insertions(+) - create mode 100644 include/linux/compiler-gcc7.h - -diff --git a/include/linux/compiler-gcc7.h b/include/linux/compiler-gcc7.h -new file mode 100644 -index 000000000000..cdd1cc202d51 ---- /dev/null -+++ b/include/linux/compiler-gcc7.h -@@ -0,0 +1,66 @@ -+#ifndef __LINUX_COMPILER_H -+#error "Please don't include directly, include instead." -+#endif -+ -+#define __used __attribute__((__used__)) -+#define __must_check __attribute__((warn_unused_result)) -+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) -+ -+/* Mark functions as cold. gcc will assume any path leading to a call -+ to them will be unlikely. This means a lot of manual unlikely()s -+ are unnecessary now for any paths leading to the usual suspects -+ like BUG(), printk(), panic() etc. [but let's keep them for now for -+ older compilers] -+ -+ Early snapshots of gcc 4.3 don't support this and we can't detect this -+ in the preprocessor, but we can live with this because they're unreleased. -+ Maketime probing would be overkill here. -+ -+ gcc also has a __attribute__((__hot__)) to move hot functions into -+ a special section, but I don't see any sense in this right now in -+ the kernel context */ -+#define __cold __attribute__((__cold__)) -+ -+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -+ -+#ifndef __CHECKER__ -+# define __compiletime_warning(message) __attribute__((warning(message))) -+# define __compiletime_error(message) __attribute__((error(message))) -+#endif /* __CHECKER__ */ -+ -+/* -+ * Mark a position in code as unreachable. This can be used to -+ * suppress control flow warnings after asm blocks that transfer -+ * control elsewhere. -+ * -+ * Early snapshots of gcc 4.5 don't support this and we can't detect -+ * this in the preprocessor, but we can live with this because they're -+ * unreleased. Really, we need to have autoconf for the kernel. -+ */ -+#define unreachable() __builtin_unreachable() -+ -+/* Mark a function definition as prohibited from being cloned. */ -+#define __noclone __attribute__((__noclone__)) -+ -+/* -+ * Tell the optimizer that something else uses this function or variable. -+ */ -+#define __visible __attribute__((externally_visible)) -+ -+/* -+ * GCC 'asm goto' miscompiles certain code sequences: -+ * -+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 -+ * -+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. -+ * Fixed in GCC 4.8.2 and later versions. -+ * -+ * (asm goto is automatically volatile - the naming reflects this.) -+ */ -+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) -+ -+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP -+#define __HAVE_BUILTIN_BSWAP32__ -+#define __HAVE_BUILTIN_BSWAP64__ -+#define __HAVE_BUILTIN_BSWAP16__ -+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ --- -2.12.3 diff --git a/recipes-bsp/u-boot/files/fw-enw-fix-missing-stdint-h.patch b/recipes-bsp/u-boot/files/fw-enw-fix-missing-stdint-h.patch deleted file mode 100644 index 652d5cfb1..000000000 --- a/recipes-bsp/u-boot/files/fw-enw-fix-missing-stdint-h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index aa437d0..4b97497 100644 ---- a/tools/env/fw_env.c -+++ b/tools/env/fw_env.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/recipes-bsp/u-boot/files/fw_env-xilinx-zynq.config b/recipes-bsp/u-boot/files/fw_env-xilinx-zynq.config deleted file mode 100644 index b2ce96786..000000000 --- a/recipes-bsp/u-boot/files/fw_env-xilinx-zynq.config +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size -/dev/mtd4 0x0000 0x20000 0x20000 -/dev/mtd5 0x0000 0x20000 0x20000 diff --git a/recipes-bsp/u-boot/files/fw_env-xilinx-zynqhf.config b/recipes-bsp/u-boot/files/fw_env-xilinx-zynqhf.config deleted file mode 100644 index b2ce96786..000000000 --- a/recipes-bsp/u-boot/files/fw_env-xilinx-zynqhf.config +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size -/dev/mtd4 0x0000 0x20000 0x20000 -/dev/mtd5 0x0000 0x20000 0x20000 diff --git a/recipes-bsp/u-boot/nilrt-u-boot.inc b/recipes-bsp/u-boot/nilrt-u-boot.inc deleted file mode 100644 index ab424f78a..000000000 --- a/recipes-bsp/u-boot/nilrt-u-boot.inc +++ /dev/null @@ -1,4 +0,0 @@ -UBOOT_BRANCH ?= "nizynq/15.0/v2012.10" -UBOOT_MACHINE ?= "nicrio9068_config" - -SRCREV = "2194b4c9d5ea9684d6c982f2036e15b980bbd3d5" diff --git a/recipes-bsp/u-boot/u-boot-fw-utils_2018.%.bbappend b/recipes-bsp/u-boot/u-boot-fw-utils_2018.%.bbappend deleted file mode 100644 index ec3fdd5ad..000000000 --- a/recipes-bsp/u-boot/u-boot-fw-utils_2018.%.bbappend +++ /dev/null @@ -1,38 +0,0 @@ -require nilrt-u-boot.inc - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" - -SRC_URI = "\ - ${NILRT_GIT}/u-boot.git;protocol=git;branch=${UBOOT_BRANCH} \ -" - -SRC_URI_append_arm = "\ - file://fw_env-${MACHINE}.config \ -" - -SRC_URI_append = " \ - file://0001-Remove-hardcoded-softfp-from-arm-makefile.patch \ - file://fw-enw-fix-missing-stdint-h.patch \ - file://0001-gcc5-backport-add-compiler-gcc5.h.patch \ - file://0002-gcc5-use-gcc-inline-version-instead-c99.patch \ - file://0003-gcc5-include-io.h-needs-inline-def-from-compiler-gcc.h.patch \ - file://fix-build-error-under-gcc6.patch \ - file://fix-build-error-under-gcc7.patch \ -" - -do_compile(){ - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - oe_runmake ${UBOOT_MACHINE} - oe_runmake HOSTCC="${CC}" HOSTSTRIP="${TARGET_PREFIX}strip" env -} - -do_install_append(){ - install -d ${D}${sysconfdir} - install -m 0644 ${WORKDIR}/fw_env-${MACHINE}.config ${D}${sysconfdir}/fw_env.config - chown 0:${LVRT_GROUP} ${D}${base_sbindir}/fw_printenv - chmod 4550 ${D}${base_sbindir}/fw_printenv - ln -sf ${base_sbindir}/fw_printenv ${D}${base_sbindir}/fw_setenv -} diff --git a/recipes-bsp/u-boot/u-boot-mkimage_2018.%.bbappend b/recipes-bsp/u-boot/u-boot-mkimage_2018.%.bbappend deleted file mode 100644 index bab4255b5..000000000 --- a/recipes-bsp/u-boot/u-boot-mkimage_2018.%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -do_install_append () { - install -d ${D}${bindir} - install -m 0755 tools/dumpimage ${D}${bindir}/uboot-dumpimage - ln -sf uboot-dumpimage ${D}${bindir}/dumpimage -} diff --git a/recipes-bsp/u-boot/u-boot_2018.%.bbappend b/recipes-bsp/u-boot/u-boot_2018.%.bbappend deleted file mode 100644 index 9d8e59088..000000000 --- a/recipes-bsp/u-boot/u-boot_2018.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -require nilrt-u-boot.inc - -SRC_URI = "${NILRT_GIT}/u-boot.git;protocol=git;branch=${UBOOT_BRANCH}" diff --git a/recipes-connectivity/iproute2/files/0001-iproute2-fix-build-for-older-systems.patch b/recipes-connectivity/iproute2/files/0001-iproute2-fix-build-for-older-systems.patch deleted file mode 100644 index 9cc42159e..000000000 --- a/recipes-connectivity/iproute2/files/0001-iproute2-fix-build-for-older-systems.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 23e444e7519d661e17d11c8effea038c1ef3875f Mon Sep 17 00:00:00 2001 -From: Ioan-Adrian Ratiu -Date: Thu, 4 Feb 2016 13:04:14 +0200 -Subject: [PATCH] iproute2: fix build for older systems - -Upstream-Status: Inapropriate - -Signed-off-by: Ioan-Adrian Ratiu ---- - ip/ipnetns.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/ip/ipnetns.c b/ip/ipnetns.c -index be0c473..dcda5d8 100644 ---- a/ip/ipnetns.c -+++ b/ip/ipnetns.c -@@ -23,6 +23,19 @@ - #include "ip_common.h" - #include "namespace.h" - -+/* sys/mount.h may be out too old to have these */ -+#ifndef MS_REC -+#define MS_REC 16384 -+#endif -+ -+#ifndef MS_SLAVE -+#define MS_SLAVE (1 << 19) -+#endif -+ -+#ifndef MS_SHARED -+#define MS_SHARED (1 << 20) -+#endif -+ - static int usage(void) - { - fprintf(stderr, "Usage: ip netns list\n"); --- -2.7.0 - diff --git a/recipes-connectivity/iproute2/files/Add-align_kernel-macro.patch b/recipes-connectivity/iproute2/files/Add-align_kernel-macro.patch deleted file mode 100644 index bb6122f77..000000000 --- a/recipes-connectivity/iproute2/files/Add-align_kernel-macro.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/tc/m_xt.c 2013-08-19 17:42:57.498043961 -0500 -+++ b/tc/m_xt.c 2013-08-19 17:45:56.725545214 -0500 -@@ -38,6 +38,11 @@ - # define XT_LIB_DIR "/lib/xtables" - #endif - -+#ifndef __ALIGN_KERNEL -+#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) -+#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) -+#endif -+ - #ifndef ALIGN - #define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) - #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) diff --git a/recipes-connectivity/iproute2/iproute2_5.%.bbappend b/recipes-connectivity/iproute2/iproute2_5.%.bbappend index de171e39d..8d121e0b9 100644 --- a/recipes-connectivity/iproute2/iproute2_5.%.bbappend +++ b/recipes-connectivity/iproute2/iproute2_5.%.bbappend @@ -1,9 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI =+ "file://Add-align_kernel-macro.patch \ - file://0001-iproute2-fix-build-for-older-systems.patch" - DEPENDS += "shadow-native pseudo-native niacctbase" RDEPENDS_{PN} += "niacctbase" diff --git a/recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bbappend b/recipes-connectivity/libnss-mdns/libnss-mdns_0.%.bbappend similarity index 100% rename from recipes-connectivity/libnss-mdns/libnss-mdns_0.10.bbappend rename to recipes-connectivity/libnss-mdns/libnss-mdns_0.%.bbappend diff --git a/recipes-connectivity/openssl/files/0001-crypto-ts-Implement-def_time_cb-on-VxWorks.patch b/recipes-connectivity/openssl/files/0001-crypto-ts-Implement-def_time_cb-on-VxWorks.patch deleted file mode 100644 index c6a2f03fd..000000000 --- a/recipes-connectivity/openssl/files/0001-crypto-ts-Implement-def_time_cb-on-VxWorks.patch +++ /dev/null @@ -1,54 +0,0 @@ -From aba8b39375cfce6ab67292707ad82891435aa2b9 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Sun, 1 Sep 2013 14:16:04 -0500 -Subject: [PATCH] crypto/ts: Implement def_time_cb() on VxWorks - -Upstream-Status: Inappropriate [VxWorks support] - ---- - crypto/ts/ts_rsp_sign.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/crypto/ts/ts_rsp_sign.c b/crypto/ts/ts_rsp_sign.c -index d55e903..39262ef 100644 ---- a/crypto/ts/ts_rsp_sign.c -+++ b/crypto/ts/ts_rsp_sign.c -@@ -61,7 +61,11 @@ - #include "o_time.h" - - #if defined(OPENSSL_SYS_UNIX) -+#ifndef VXWORKS_PPC - # include -+#else -+# include -+#endif - #endif - - #include -@@ -116,6 +120,10 @@ static ASN1_INTEGER *def_serial_cb(struct TS_resp_ctx *ctx, void *data) - static int def_time_cb(struct TS_resp_ctx *ctx, void *data, - long *sec, long *usec) - { -+#ifdef VXWORKS_PPC -+ struct timespec timeSpec; -+ clock_gettime(CLOCK_REALTIME, &timeSpec); -+#else - struct timeval tv; - if (gettimeofday(&tv, NULL) != 0) { - TSerr(TS_F_DEF_TIME_CB, TS_R_TIME_SYSCALL_ERROR); -@@ -124,9 +132,15 @@ static int def_time_cb(struct TS_resp_ctx *ctx, void *data, - TS_RESP_CTX_add_failure_info(ctx, TS_INFO_TIME_NOT_AVAILABLE); - return 0; - } -+#endif - /* Return time to caller. */ -+#ifdef VXWORKS_PPC -+ *sec = timeSpec.tv_sec; -+ *usec = timeSpec.tv_nsec / 1000; -+#else - *sec = tv.tv_sec; - *usec = tv.tv_usec; -+#endif - - return 1; - } diff --git a/recipes-connectivity/openssl/files/0002-ssl-Implement-get_current_time-on-VxWorks.patch b/recipes-connectivity/openssl/files/0002-ssl-Implement-get_current_time-on-VxWorks.patch deleted file mode 100644 index 469793d39..000000000 --- a/recipes-connectivity/openssl/files/0002-ssl-Implement-get_current_time-on-VxWorks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f80ceb7459ec4473bbf4334415392250174ebbc1 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 17:10:42 -0500 -Subject: [PATCH] ssl: Implement get_current_time() on VxWorks - -Upstream-Status: Inappropriate [VxWorks support] - ---- - ssl/d1_lib.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c -index 95b5033..46aacc4 100644 ---- a/ssl/d1_lib.c -+++ b/ssl/d1_lib.c -@@ -549,6 +549,11 @@ static void get_current_time(struct timeval *t) - ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; -+#elif defined(OPENSSL_SYS_VXWORKS) -+ struct timespec ts; -+ clock_gettime(CLOCK_REALTIME, &ts); -+ t->tv_sec = ts.tv_sec; -+ t->tv_usec = ts.tv_nsec / 1000; - #else - gettimeofday(t, NULL); - #endif diff --git a/recipes-connectivity/openssl/files/0003-crypto-bio-Implement-get_current_time-on-VxWorks.patch b/recipes-connectivity/openssl/files/0003-crypto-bio-Implement-get_current_time-on-VxWorks.patch deleted file mode 100644 index 6a5f97e1f..000000000 --- a/recipes-connectivity/openssl/files/0003-crypto-bio-Implement-get_current_time-on-VxWorks.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5cc72b8a486a302f7906ddff3e8a5e1438cd5acd Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 17:11:33 -0500 -Subject: [PATCH] crypto/bio: Implement get_current_time() on VxWorks - -Upstream-Status: Inappropriate [VxWorks support] - ---- - crypto/bio/bss_dgram.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c -index bdd7bf8..822ccb9 100644 ---- a/crypto/bio/bss_dgram.c -+++ b/crypto/bio/bss_dgram.c -@@ -2073,6 +2073,11 @@ static void get_current_time(struct timeval *t) - ftime(&tb); - t->tv_sec = (long)tb.time; - t->tv_usec = (long)tb.millitm * 1000; -+#elif defined(OPENSSL_SYSNAME_VXWORKS) -+ struct timespec ts; -+ clock_gettime(CLOCK_REALTIME, &ts); -+ t->tv_sec = ts.tv_sec; -+ t->tv_usec = ts.tv_nsec / 1000; - # else - gettimeofday(t, NULL); - # endif diff --git a/recipes-connectivity/openssl/files/0004-crypto-Implement-OpenSSLDie-as-abort-on-Phar-Lap-ETS.patch b/recipes-connectivity/openssl/files/0004-crypto-Implement-OpenSSLDie-as-abort-on-Phar-Lap-ETS.patch deleted file mode 100644 index ae433da1d..000000000 --- a/recipes-connectivity/openssl/files/0004-crypto-Implement-OpenSSLDie-as-abort-on-Phar-Lap-ETS.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4d0611933b20dda2a05706adaf399f91e2b11ce1 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 13:06:51 -0500 -Subject: [PATCH] crypto: Implement OpenSSLDie() as abort() on Phar Lap ETS - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/cryptlib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c -index 5fab45b..8c9e434 100644 ---- a/crypto/cryptlib.c -+++ b/crypto/cryptlib.c -@@ -1005,7 +1005,7 @@ void OpenSSLDie(const char *file, int line, const char *assertion) - OPENSSL_showfatal - ("%s(%d): OpenSSL internal error, assertion failed: %s\n", file, line, - assertion); --#if !defined(_WIN32) || defined(__CYGWIN__) -+#if !defined(_WIN32) || defined(__CYGWIN__) || defined(PHARLAP) - abort(); - #else - /* diff --git a/recipes-connectivity/openssl/files/0005-crypto-Remove-unsupported-headers-in-cryptlib.c-on-P.patch b/recipes-connectivity/openssl/files/0005-crypto-Remove-unsupported-headers-in-cryptlib.c-on-P.patch deleted file mode 100644 index 4668e9794..000000000 --- a/recipes-connectivity/openssl/files/0005-crypto-Remove-unsupported-headers-in-cryptlib.c-on-P.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6c19a8db2950c2fa28169d3682024ccba69581cc Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 13:15:15 -0500 -Subject: [PATCH] crypto: Remove unsupported headers in cryptlib.c on Phar Lap - ETS - -Remove unsupported headers tchar.h and signal.h in cryptlib.c -on Phar Lap ETS. - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/cryptlib.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c -index 8c9e434..f045e60 100644 ---- a/crypto/cryptlib.c -+++ b/crypto/cryptlib.c -@@ -794,7 +794,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) - } - #endif - --#if defined(_WIN32) && !defined(__CYGWIN__) -+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(PHARLAP) - # include - # include - # ifdef __WATCOMC__ diff --git a/recipes-connectivity/openssl/files/0006-crypto-rand-Disable-unsupported-readscreen-on-Phar-L.patch b/recipes-connectivity/openssl/files/0006-crypto-rand-Disable-unsupported-readscreen-on-Phar-L.patch deleted file mode 100644 index 4c8721eca..000000000 --- a/recipes-connectivity/openssl/files/0006-crypto-rand-Disable-unsupported-readscreen-on-Phar-L.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 39efa289a34364e20c250d760c48fd15211f3a08 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 14:15:34 -0500 -Subject: [PATCH] crypto/rand: Disable unsupported readscreen() on Phar Lap ETS - -Disable RNG seeding from the screen on Phar Lap ETS (the readscreen() -function). NI's distribution of Phar Lap ETS does not support the -requisite system APIs. - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/rand/rand_win.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c -index b4be309..d59cb48 100644 ---- a/crypto/rand/rand_win.c -+++ b/crypto/rand/rand_win.c -@@ -678,7 +678,7 @@ static void readtimer(void) - - static void readscreen(void) - { --# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) -+# if !defined(OPENSSL_SYS_WINCE) && !defined(OPENSSL_SYS_WIN32_CYGWIN) && !defined(PHARLAP) - HDC hScrDC; /* screen DC */ - HBITMAP hBitmap; /* handle for our bitmap */ - BITMAP bm; /* bitmap properties */ diff --git a/recipes-connectivity/openssl/files/0007-crypto-rand-Don-t-include-unsupported-Windows-header.patch b/recipes-connectivity/openssl/files/0007-crypto-rand-Don-t-include-unsupported-Windows-header.patch deleted file mode 100644 index e840ce2df..000000000 --- a/recipes-connectivity/openssl/files/0007-crypto-rand-Don-t-include-unsupported-Windows-header.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e75899b37bd6ced8192e7a082f97ade670a39b56 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 14:21:11 -0500 -Subject: [PATCH] crypto/rand: Don't include unsupported Windows headers on - Phar Lap ETS - -Don't include unsupported Windows headers on Phar Lap ETS in rand_win.c. - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/rand/rand_win.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c -index d59cb48..b567335 100644 ---- a/crypto/rand/rand_win.c -+++ b/crypto/rand/rand_win.c -@@ -113,7 +113,7 @@ - #include - #include "rand_lcl.h" - --#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) -+#if (defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)) && !defined(PHARLAP) - # include - # ifndef _WIN32_WINNT - # define _WIN32_WINNT 0x0400 diff --git a/recipes-connectivity/openssl/files/0008-rand_win.c-Stub-RAND_poll-on-Phar-Lap-ETS.patch b/recipes-connectivity/openssl/files/0008-rand_win.c-Stub-RAND_poll-on-Phar-Lap-ETS.patch deleted file mode 100644 index a3591d656..000000000 --- a/recipes-connectivity/openssl/files/0008-rand_win.c-Stub-RAND_poll-on-Phar-Lap-ETS.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a4eb1068d5e0d79a479fe51c74e7e49d49d070c8 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Fri, 12 Feb 2016 16:56:58 -0600 -Subject: [PATCH] rand_win.c: Stub RAND_poll() on Phar Lap ETS - -Stub RAND_poll() on Phar Lap ETS to match VxWorks implementation -in rand_unix.c. - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/rand/rand_win.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c -index b567335..cbf8bca 100644 ---- a/crypto/rand/rand_win.c -+++ b/crypto/rand/rand_win.c -@@ -745,3 +745,10 @@ static void readscreen(void) - } - - #endif -+ -+#if defined(PHARLAP) -+int RAND_poll(void) -+{ -+ return 0; -+} -+#endif diff --git a/recipes-connectivity/openssl/files/0009-crypto-des-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-.patch b/recipes-connectivity/openssl/files/0009-crypto-des-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-.patch deleted file mode 100644 index 333a53b54..000000000 --- a/recipes-connectivity/openssl/files/0009-crypto-des-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ed711549352200ef2dca5fa147730f33f192c277 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 14:38:30 -0500 -Subject: [PATCH] crypto/des: Disable WIN_CONSOLE_BUG hack on Phar Lap ETS - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/des/read_pwd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c -index 080d3e8..69e5792 100644 ---- a/crypto/des/read_pwd.c -+++ b/crypto/des/read_pwd.c -@@ -514,7 +514,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) - break; - } - } --# ifdef WIN_CONSOLE_BUG -+# if defined(WIN_CONSOLE_BUG) && !defined(PHARLAP) - /* - * Win95 has several evil console bugs: one of these is that the last - * character read using getch() is passed to the next read: this is diff --git a/recipes-connectivity/openssl/files/0010-crypto-ui-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-E.patch b/recipes-connectivity/openssl/files/0010-crypto-ui-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-E.patch deleted file mode 100644 index 059b779c1..000000000 --- a/recipes-connectivity/openssl/files/0010-crypto-ui-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-E.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a15b0e4582fe2a77f84e47888f1c0d9864fc4d3e Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Thu, 2 Apr 2015 14:41:24 -0500 -Subject: [PATCH] crypto/ui: Disable WIN_CONSOLE_BUG hack on Phar Lap ETS - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/ui/ui_openssl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c -index 8a43590..00dcfa7 100644 ---- a/crypto/ui/ui_openssl.c -+++ b/crypto/ui/ui_openssl.c -@@ -716,7 +716,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty) - break; - } - } --# ifdef WIN_CONSOLE_BUG -+# if defined(WIN_CONSOLE_BUG) && !defined(PHARLAP) - /* - * Win95 has several evil console bugs: one of these is that the last - * character read using getch() is passed to the next read: this is diff --git a/recipes-connectivity/openssl/files/0011-crypto-bio-Disable-xopenlog-xcloselog-on-Phar-Lap-ET.patch b/recipes-connectivity/openssl/files/0011-crypto-bio-Disable-xopenlog-xcloselog-on-Phar-Lap-ET.patch deleted file mode 100644 index 1d69dcd02..000000000 --- a/recipes-connectivity/openssl/files/0011-crypto-bio-Disable-xopenlog-xcloselog-on-Phar-Lap-ET.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 75ae52cfffb5943e47a79703fb97f8c23e8bd041 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Sun, 1 Sep 2013 13:54:41 -0500 -Subject: [PATCH] crypto/bio: Disable xopenlog()/xcloselog() on Phar Lap ETS - -Disable xopenlog()/xcloselog() on Phar Lap ETS because NI's distribution -does not support the requisite system APIs. - -Upstream-Status: Inappropriate [Phar Lap ETS support] - ---- - crypto/bio/bss_log.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c -index 1283a52..3d9168f 100644 ---- a/crypto/bio/bss_log.c -+++ b/crypto/bio/bss_log.c -@@ -283,9 +283,11 @@ static int MS_CALLBACK slg_puts(BIO *bp, const char *str) - - static void xopenlog(BIO *bp, char *name, int level) - { -+#ifndef PHARLAP - if (check_winnt()) - bp->ptr = RegisterEventSourceA(NULL, name); - else -+#endif /* PHARLAP */ - bp->ptr = NULL; - } - -@@ -331,8 +333,10 @@ static void xsyslog(BIO *bp, int priority, const char *string) - - static void xcloselog(BIO *bp) - { -+#ifndef PHARLAP - if (bp->ptr) - DeregisterEventSource((HANDLE) (bp->ptr)); -+#endif /* PHARLAP */ - bp->ptr = NULL; - } - diff --git a/recipes-connectivity/openssl/files/0012-crypto-Use-i686-instead-of-i486-in-MASM-script.patch b/recipes-connectivity/openssl/files/0012-crypto-Use-i686-instead-of-i486-in-MASM-script.patch deleted file mode 100644 index 0b792e2a6..000000000 --- a/recipes-connectivity/openssl/files/0012-crypto-Use-i686-instead-of-i486-in-MASM-script.patch +++ /dev/null @@ -1,33 +0,0 @@ -From af53b0d9e19ec2f90af52dcfee44af0b39a3e16d Mon Sep 17 00:00:00 2001 -From: Jacob Champion -Date: Fri, 22 Nov 2013 10:47:20 -0600 -Subject: [PATCH] crypto: Use i686 instead of i486 in MASM script - -Although technically MASM is unsupported, we can't use NASM in Build -Services (or at least not at the moment). Luckily, Windows 32- and -64-bit builds for 1.0.1e appear to work fine with MASM -- except for the -x86*cpuid assembly files, which use instructions that weren't introduced -until Intel 686. This is acceptable for us on Windows, so bump the ISA -in the MASM generator script. - -Natinst-ReviewBoard-ID: 53579 - -Upstream-Status: Inappropriate [NIBuild support] - ---- - crypto/perlasm/x86masm.pl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl -index 1741342..786b3c4 100644 ---- a/crypto/perlasm/x86masm.pl -+++ b/crypto/perlasm/x86masm.pl -@@ -82,7 +82,7 @@ TITLE $_[0].asm - IF \@Version LT 800 - ECHO MASM version 8.00 or later is strongly recommended. - ENDIF --.486 -+.686 - .MODEL FLAT - OPTION DOTNAME - IF \@Version LT 800 diff --git a/recipes-connectivity/openssl/files/0013-perlasm-x86masm.pl-make-it-work.patch b/recipes-connectivity/openssl/files/0013-perlasm-x86masm.pl-make-it-work.patch deleted file mode 100644 index a554a5519..000000000 --- a/recipes-connectivity/openssl/files/0013-perlasm-x86masm.pl-make-it-work.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 9b3f92f5e8cb99228785586cadb2dd4f4732da26 Mon Sep 17 00:00:00 2001 -From: Andy Polyakov -Date: Sun, 22 Feb 2015 19:23:25 +0100 -Subject: [PATCH] perlasm/x86masm.pl: make it work. - -Though this doesn't mean that masm becomes supported, the script is -still provided on don't-ask-in-case-of-doubt-use-nasm basis. -See RT#3650 for background. - -Reviewed-by: Matt Caswell - -Upstream-Status: Backport - ---- - crypto/perlasm/x86masm.pl | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/crypto/perlasm/x86masm.pl b/crypto/perlasm/x86masm.pl -index 786b3c4..b7f49d1 100644 ---- a/crypto/perlasm/x86masm.pl -+++ b/crypto/perlasm/x86masm.pl -@@ -18,10 +18,10 @@ sub ::generic - - if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no [] - { $opcode="mov"; } -- elsif ($opcode !~ /movq/) -+ elsif ($opcode !~ /mov[dq]$/) - { # fix xmm references -- $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i); -- $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); -+ $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i); -+ $arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); - } - - &::emit($opcode,@arg); -@@ -160,13 +160,13 @@ sub ::public_label - { push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); } - - sub ::data_byte --{ push(@out,("DB\t").join(',',@_)."\n"); } -+{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); } - - sub ::data_short --{ push(@out,("DW\t").join(',',@_)."\n"); } -+{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); } - - sub ::data_word --{ push(@out,("DD\t").join(',',@_)."\n"); } -+{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); } - - sub ::align - { push(@out,"ALIGN\t$_[0]\n"); } diff --git a/recipes-connectivity/openssl/files/0014-crypto-o_time.c-Workaround-gmtime_r-bug-on-VxWorks.patch b/recipes-connectivity/openssl/files/0014-crypto-o_time.c-Workaround-gmtime_r-bug-on-VxWorks.patch deleted file mode 100644 index 8e6a1b7e5..000000000 --- a/recipes-connectivity/openssl/files/0014-crypto-o_time.c-Workaround-gmtime_r-bug-on-VxWorks.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8c77b60f34c176430f49380e3b450165d5a12324 Mon Sep 17 00:00:00 2001 -From: Haris Okanovic -Date: Wed, 20 Feb 2019 18:01:19 -0600 -Subject: [PATCH] crypto/o_time.c: Workaround gmtime_r() bug on VxWorks - -gmtime_r() always returns 0 on VxWorks, so ignore it's return value on -this platform. - -OpenSSL_1_0_2k and earlier ignored gmtime_r() retval on all platforms. -The code changed in OpenSSL_1_0_2l (commit b70dc3a66d1) and broke -VxWorks builds. This change reverts to the old behavior only on VxWorks. - -Upstream-Status: Inappropriate [VxWorks support] ---- - crypto/o_time.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/crypto/o_time.c b/crypto/o_time.c -index 61927439ea..eaeadb25f1 100755 ---- a/crypto/o_time.c -+++ b/crypto/o_time.c -@@ -106,8 +106,13 @@ struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result) - struct tm *ts = NULL; - - #if defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_OS2) && (!defined(OPENSSL_SYS_VMS) || defined(gmtime_r)) && !defined(OPENSSL_SYS_SUNOS) -+#if defined(OPENSSL_SYS_VXWORKS) -+ /* XXX gmtime_r() always returns NULL on VxWorks, ignore it */ -+ gmtime_r(timer, result); -+#else - if (gmtime_r(timer, result) == NULL) - return NULL; -+#endif - ts = result; - #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK) - ts = gmtime(timer); --- -2.20.1 - diff --git a/recipes-connectivity/openssl/openssl_1.0.2o.bbappend b/recipes-connectivity/openssl/openssl_1.0.2o.bbappend deleted file mode 100644 index 17be48aab..000000000 --- a/recipes-connectivity/openssl/openssl_1.0.2o.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI_remove = "file://debian/pic.patch" - -# Patches for NI VxWorks in NIBuild -SRC_URI += " \ - file://0001-crypto-ts-Implement-def_time_cb-on-VxWorks.patch \ - file://0002-ssl-Implement-get_current_time-on-VxWorks.patch \ - file://0003-crypto-bio-Implement-get_current_time-on-VxWorks.patch \ - file://0014-crypto-o_time.c-Workaround-gmtime_r-bug-on-VxWorks.patch \ -" - -# Patches for NI Phar Lap ETS in NIBuild -SRC_URI += " \ - file://0004-crypto-Implement-OpenSSLDie-as-abort-on-Phar-Lap-ETS.patch \ - file://0005-crypto-Remove-unsupported-headers-in-cryptlib.c-on-P.patch \ - file://0006-crypto-rand-Disable-unsupported-readscreen-on-Phar-L.patch \ - file://0007-crypto-rand-Don-t-include-unsupported-Windows-header.patch \ - file://0008-rand_win.c-Stub-RAND_poll-on-Phar-Lap-ETS.patch \ - file://0009-crypto-des-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-.patch \ - file://0010-crypto-ui-Disable-WIN_CONSOLE_BUG-hack-on-Phar-Lap-E.patch \ - file://0011-crypto-bio-Disable-xopenlog-xcloselog-on-Phar-Lap-ET.patch \ -" - -# Patches for Windows in NIBuild -SRC_URI += " \ - file://0012-crypto-Use-i686-instead-of-i486-in-MASM-script.patch \ - file://0013-perlasm-x86masm.pl-make-it-work.patch \ -" - -ENABLE_SRC_INSTALL_${PN} = "1" diff --git a/recipes-connectivity/openssl/openssl_1.1.1g.bbappend b/recipes-connectivity/openssl/openssl_1.1.1g.bbappend new file mode 100644 index 000000000..ed89d2602 --- /dev/null +++ b/recipes-connectivity/openssl/openssl_1.1.1g.bbappend @@ -0,0 +1,8 @@ +# Remove Debian's pic.patch from NILRT's build of OpenSSL. The +# changes are not properly scoped to Linux only and break +# Windows/msvc builds which consume NILRT/OE source packages. The +# modified perl scripts are also not called during either the x64 or +# xilinx-zynqhf builds of NILRT, so there's no real value in +# improving the change. + +SRC_URI_remove = "file://debian/pic.patch" diff --git a/recipes-containers/docker/docker_git.bbappend b/recipes-containers/docker/docker_git.bbappend deleted file mode 100644 index 4edb3d976..000000000 --- a/recipes-containers/docker/docker_git.bbappend +++ /dev/null @@ -1 +0,0 @@ -RRECOMMENDS_${PN}_remove += "docker-registry" diff --git a/recipes-core/coreutils/coreutils_8.%.bbappend b/recipes-core/coreutils/coreutils_8.%.bbappend index 039c7e44a..f2d6bc9df 100644 --- a/recipes-core/coreutils/coreutils_8.%.bbappend +++ b/recipes-core/coreutils/coreutils_8.%.bbappend @@ -11,7 +11,7 @@ DEPENDS += "shadow-native pseudo-native niacctbase" RDEPENDS_${PN}-hostname += "niacctbase" # preserve existing behavior when installing base package -RDEPENDS_${PN}_class-target += "\ +RDEPENDS_coreutils_class-target += "\ ${PN}-hostname \ ${PN}-ls \ ${PN}-chcon \ @@ -19,6 +19,8 @@ RDEPENDS_${PN}_class-target += "\ ${PN}-timeout \ " +PRIORITY = "120" + pkg_postinst_${PN}-hostname () { chmod 4550 $D${base_bindir}/hostname.${BPN} chown 0:${LVRT_GROUP} $D${base_bindir}/hostname.${BPN} @@ -31,7 +33,7 @@ pkg_prerm_${PN}-hostname () { } pkg_postinst_${PN}-ls () { - update-alternatives --install ${base_bindir}/ls ls ls.${BPN} 100 + update-alternatives --install ${base_bindir}/ls ls ls.${BPN} ${PRIORITY} } pkg_prerm_${PN}-ls () { @@ -39,7 +41,7 @@ pkg_prerm_${PN}-ls () { } pkg_postinst_${PN}-chcon () { - update-alternatives --install ${bindir}/chcon chcon chcon.${BPN} 100 + update-alternatives --install ${bindir}/chcon chcon chcon.${BPN} ${PRIORITY} } pkg_prerm_${PN}-chcon () { @@ -47,7 +49,7 @@ pkg_prerm_${PN}-chcon () { } pkg_postinst_${PN}-shred () { - update-alternatives --install ${bindir}/shred shred shred.${BPN} 100 + update-alternatives --install ${bindir}/shred shred shred.${BPN} ${PRIORITY} } pkg_prerm_${PN}-shred () { @@ -55,7 +57,7 @@ pkg_prerm_${PN}-shred () { } pkg_postinst_${PN}-timeout () { - update-alternatives --install ${bindir}/timeout timeout timeout.${BPN} 100 + update-alternatives --install ${bindir}/timeout timeout timeout.${BPN} ${PRIORITY} } pkg_prerm_${PN}-timeout () { diff --git a/recipes-core/readline/readline_7.%.bbappend b/recipes-core/readline/readline_8.%.bbappend similarity index 100% rename from recipes-core/readline/readline_7.%.bbappend rename to recipes-core/readline/readline_8.%.bbappend diff --git a/recipes-core/udev/eudev_3.%.bbappend b/recipes-core/udev/eudev_3.%.bbappend index 5f266a51b..41e2ab715 100644 --- a/recipes-core/udev/eudev_3.%.bbappend +++ b/recipes-core/udev/eudev_3.%.bbappend @@ -1,9 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/udev:" - -SRC_URI =+ " \ - file://0001-ni-skip-kmod-for-wl12xx.patch \ -" - EXTRA_OECONF =+ "--disable-mtd_probe" # we don't use the hwdb and it consumes around 10mb of space so disable it diff --git a/recipes-core/udev/udev/0001-ni-skip-kmod-for-wl12xx.patch b/recipes-core/udev/udev/0001-ni-skip-kmod-for-wl12xx.patch deleted file mode 100644 index 1793fceac..000000000 --- a/recipes-core/udev/udev/0001-ni-skip-kmod-for-wl12xx.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules -index 8551f47..ac8bb60 100644 ---- a/rules/80-drivers.rules -+++ b/rules/80-drivers.rules -@@ -2,6 +2,9 @@ - - ACTION=="remove", GOTO="drivers_end" - -+# skip kmod for wl12xx device to prevent 30s delay issues with 3.2 kernel -+ENV{MODALIAS}=="platform:wl12xx", GOTO="drivers_end" -+ - ENV{MODALIAS}=="?*", RUN{builtin}+="kmod load $env{MODALIAS}" - SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN{builtin}+="kmod load tifm_sd" - SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN{builtin}+="kmod load tifm_ms" diff --git a/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend index 21ded56db..05b3e6957 100644 --- a/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend +++ b/recipes-devtools/gcc/gcc-cross-canadian_%.bbappend @@ -1,17 +1,17 @@ # set gcc default settings to match TUNE_CCARGS python () { - ccargs = d.getVar("TUNE_CCARGS", True).split() - for a in ccargs: - arg = a.split('=') - if len(arg) < 2: - continue - if arg[0] == '-march': - d.appendVar("EXTRA_OECONF_append", " --with-arch=" + arg[1]) - elif arg[0] == '-mtune': - d.appendVar("EXTRA_OECONF_append", " --with-tune=" + arg[1]) - elif arg[0] == '-mfpu': - d.appendVar("EXTRA_OECONF_append", " --with-fpu=" + arg[1]) - elif arg[0] == '-mfloat-abi': - d.appendVar("EXTRA_OECONF_append", " --with-float=" + arg[1]) + ccargs = d.getVar("TUNE_CCARGS", True).split() + for a in ccargs: + arg = a.split('=') + if len(arg) < 2: + continue + if arg[0] == '-march': + d.appendVar("EXTRA_OECONF_append", " --with-arch=" + arg[1]) + elif arg[0] == '-mtune': + d.appendVar("EXTRA_OECONF_append", " --with-tune=" + arg[1]) + elif arg[0] == '-mfpu': + d.appendVar("EXTRA_OECONF_append", " --with-fpu=" + arg[1]) + elif arg[0] == '-mfloat-abi': + d.appendVar("EXTRA_OECONF_append", " --with-float=" + arg[1]) } diff --git a/recipes-devtools/gcc/gcc_%.bbappend b/recipes-devtools/gcc/gcc_%.bbappend index 21ded56db..05b3e6957 100644 --- a/recipes-devtools/gcc/gcc_%.bbappend +++ b/recipes-devtools/gcc/gcc_%.bbappend @@ -1,17 +1,17 @@ # set gcc default settings to match TUNE_CCARGS python () { - ccargs = d.getVar("TUNE_CCARGS", True).split() - for a in ccargs: - arg = a.split('=') - if len(arg) < 2: - continue - if arg[0] == '-march': - d.appendVar("EXTRA_OECONF_append", " --with-arch=" + arg[1]) - elif arg[0] == '-mtune': - d.appendVar("EXTRA_OECONF_append", " --with-tune=" + arg[1]) - elif arg[0] == '-mfpu': - d.appendVar("EXTRA_OECONF_append", " --with-fpu=" + arg[1]) - elif arg[0] == '-mfloat-abi': - d.appendVar("EXTRA_OECONF_append", " --with-float=" + arg[1]) + ccargs = d.getVar("TUNE_CCARGS", True).split() + for a in ccargs: + arg = a.split('=') + if len(arg) < 2: + continue + if arg[0] == '-march': + d.appendVar("EXTRA_OECONF_append", " --with-arch=" + arg[1]) + elif arg[0] == '-mtune': + d.appendVar("EXTRA_OECONF_append", " --with-tune=" + arg[1]) + elif arg[0] == '-mfpu': + d.appendVar("EXTRA_OECONF_append", " --with-fpu=" + arg[1]) + elif arg[0] == '-mfloat-abi': + d.appendVar("EXTRA_OECONF_append", " --with-float=" + arg[1]) } diff --git a/recipes-devtools/python/python_%.bbappend b/recipes-devtools/python/python_%.bbappend deleted file mode 100644 index 034d07ad7..000000000 --- a/recipes-devtools/python/python_%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# we don't want python 2 to take precedence over the default python 3 because -# it breaks salt if it gets installed from the feeds alongside python 3 -do_install_append () { - rm -f ${D}${bindir}/python -} diff --git a/recipes-extended/tzdata/tzdata_%.bbappend b/recipes-extended/timezone/tzdata.bbappend similarity index 100% rename from recipes-extended/tzdata/tzdata_%.bbappend rename to recipes-extended/timezone/tzdata.bbappend diff --git a/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch b/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch new file mode 100644 index 000000000..473827448 --- /dev/null +++ b/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch @@ -0,0 +1,30 @@ +From ceefcb19cebf8bc3d45ee502f8eabd3bc5bd0aac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 11 Feb 2017 16:42:12 +0100 +Subject: [PATCH] configure.in: remove deprecated GNOME_COMMON_INIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 8905f1c..3901398 100644 +--- a/configure.in ++++ b/configure.in +@@ -15,7 +15,6 @@ AC_CONFIG_HEADERS([config.h]) + + AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) + +-GNOME_COMMON_INIT + + if test "$enable_debug" != "no"; then + AC_DEFINE([DEBUG],[1],[enable use of LIBGLADE_DEBUG environment variable]) +-- +2.9.3 + diff --git a/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch b/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch new file mode 100644 index 000000000..c5d586465 --- /dev/null +++ b/recipes-gnome/libglade/libglade-2.6.4/glade-cruft.patch @@ -0,0 +1,102 @@ +Upstream-Status: Pending + +diff -ur libglade-2.4.0~/configure.in libglade-2.4.0/configure.in +--- libglade-2.4.0~/configure.in 2004-05-17 12:38:31.000000000 +0100 ++++ libglade-2.4.0/configure.in 2004-07-28 16:53:09.000000000 +0100 +@@ -147,6 +147,18 @@ + AM_CONDITIONAL(HAVE_PYTHON, $have_python) + AC_SUBST(PYTHON) + ++AC_MSG_CHECKING([for cruft in libgtk]) ++AC_TRY_LINK([ ++#include ++#include ++], [ gtk_tree_get_type (); return 0; ], ++ [ AC_MSG_RESULT(yes) ++ have_cruft=yes ], ++ [ AC_MSG_RESULT(no) ++ AC_DEFINE(DISABLE_CRUFT,,[leave out support for old, broken widgets]) ++ have_cruft=no ]) ++AC_SUBST(DISABLE_CRUFT) ++ + dnl add debugging options ... + changequote(,)dnl + if test "x$GCC" = xyes; then +Only in libglade-2.4.0: configure.in.orig +diff -ur libglade-2.4.0~/glade/glade-gtk.c libglade-2.4.0/glade/glade-gtk.c +--- libglade-2.4.0~/glade/glade-gtk.c 2004-03-13 13:47:35.000000000 +0000 ++++ libglade-2.4.0/glade/glade-gtk.c 2004-07-28 16:53:52.000000000 +0100 +@@ -213,6 +213,8 @@ + gtk_clist_column_titles_hide (GTK_CLIST (w)); + } + ++#ifndef DISABLE_CRUFT ++ + static void + tree_set_selection_mode (GladeXML *xml, GtkWidget *w, + const char *name, const char *value) +@@ -238,6 +240,8 @@ + gtk_tree_set_view_lines (GTK_TREE (w), BOOL (value)); + } + ++#endif ++ + static void + list_set_selection_mode (GladeXML *xml, GtkWidget *w, + const char *name, const char *value) +@@ -254,6 +258,7 @@ + gtk_check_menu_item_set_show_toggle (GTK_CHECK_MENU_ITEM (w), BOOL (value)); + } + ++#ifndef DISABLE_CRUFT + static void + text_set_text (GladeXML *xml, GtkWidget *w, + const char *name, const char *value) +@@ -262,6 +267,7 @@ + + gtk_editable_insert_text (GTK_EDITABLE (w), value, -1, &pos); + } ++#endif + + static void + radio_menu_item_set_group (GladeXML *xml, GtkWidget *w, +@@ -1125,13 +1131,17 @@ + glade_register_custom_prop (GTK_TYPE_CLIST, "selection_mode", clist_set_selection_mode); + glade_register_custom_prop (GTK_TYPE_CLIST, "shadow_type", clist_set_shadow_type); + glade_register_custom_prop (GTK_TYPE_CLIST, "show_titles", clist_set_show_titles); ++#ifndef DISABLE_CRUFT + glade_register_custom_prop (GTK_TYPE_TREE, "selection_mode", tree_set_selection_mode); + glade_register_custom_prop (GTK_TYPE_TREE, "view_mode", tree_set_view_mode); + glade_register_custom_prop (GTK_TYPE_TREE, "view_line", tree_set_view_line); ++#endif + glade_register_custom_prop (GTK_TYPE_LIST, "selection_mode", list_set_selection_mode); + glade_register_custom_prop (GTK_TYPE_CHECK_MENU_ITEM, "always_show_toggle", + check_menu_item_set_always_show_toggle); ++#ifndef DISABLE_CRUFT + glade_register_custom_prop (GTK_TYPE_TEXT, "text", text_set_text); ++#endif + glade_register_custom_prop (GTK_TYPE_RADIO_MENU_ITEM, "group", + radio_menu_item_set_group); + glade_register_custom_prop (GTK_TYPE_TOOLBAR, "tooltips", toolbar_set_tooltips); +@@ -1288,8 +1298,10 @@ + glade_standard_build_children, NULL); + glade_register_widget (GTK_TYPE_TEAROFF_MENU_ITEM, glade_standard_build_widget, + NULL, NULL); ++#ifndef DISABLE_CRUFT + glade_register_widget (GTK_TYPE_TEXT, glade_standard_build_widget, + NULL, NULL); ++#endif + glade_register_widget (GTK_TYPE_TEXT_VIEW, glade_standard_build_widget, + NULL, NULL); + glade_register_widget (GTK_TYPE_TIPS_QUERY, glade_standard_build_widget, +@@ -1304,8 +1316,10 @@ + glade_standard_build_children, NULL); + glade_register_widget (GTK_TYPE_TOOL_BUTTON, glade_standard_build_widget, + NULL, NULL); ++#ifndef DISABLE_CRUFT + glade_register_widget (GTK_TYPE_TREE, glade_standard_build_widget, + NULL, NULL); ++#endif + glade_register_widget (GTK_TYPE_TREE_VIEW, glade_standard_build_widget, + NULL, NULL); + glade_register_widget (GTK_TYPE_VBUTTON_BOX, glade_standard_build_widget, diff --git a/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch b/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch new file mode 100644 index 000000000..dc4c092fd --- /dev/null +++ b/recipes-gnome/libglade/libglade-2.6.4/no-xml2.patch @@ -0,0 +1,501 @@ +Upstream-Status: Inappropriate [configuration] + +diff -urN libglade-2.4.2.orig/configure.in libglade-2.4.2/configure.in +--- libglade-2.4.2.orig/configure.in 2005-02-11 12:42:58.000000000 +0100 ++++ libglade-2.4.2/configure.in 2005-03-22 01:22:00.000000000 +0100 +@@ -52,11 +52,33 @@ + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + + PKG_CHECK_MODULES(LIBGLADE, [dnl +- libxml-2.0 >= required_libxml_version dnl + atk >= required_atk_version dnl + gtk+-2.0 >= required_gtk_version dnl + glib-2.0 >= required_glib_version]) + ++disable_xml2=no ++AC_ARG_WITH([libxml2], ++ AC_HELP_STRING([--without-libxml2], [Don't use libxml2, use Glib's GMarkupParser instead]), ++ [disable_xml2=yes], ++ [disable_xml2=no]) ++ ++AC_MSG_CHECKING([if we are using libxml2]) ++if test "x$disable_xml2" == "xno"; then ++ AC_MSG_RESULT(yes) ++ PKG_CHECK_MODULES(XML2, libxml-2.0 >= 2.4.10) ++ PKGCFG_REQUIRE_LIBXML2="libxml-2.0" ++ LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS $XML2_CFLAGS" ++ LIBGLADE_LIBS="$LIBGLADE_LIBS $XML2_LIBS" ++else ++ LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS -DUSE_GMARKUP_PARSER" ++ PKGCFG_REQUIRE_LIBXML2="" ++ AC_MSG_RESULT(no) ++fi ++ ++AC_SUBST(XML2_LIBS) ++AC_SUBST(XML2_CFLAGS) ++AC_SUBST(PKGCFG_REQUIRE_LIBXML2) ++ + AC_MSG_CHECKING([for native Win32]) + case "$host" in + *-*-mingw*) +@@ -116,6 +138,21 @@ + fi + fi + ++if test "x$disable_xml2" == "xyes"; then ++ echo "*****************************************************" ++ echo " You chose to disable libxml2 and use Glib's" ++ echo " GMarkupParser instead." ++ echo ++ echo " Please bear in mind that using libglade with" ++ echo " GMarkupParser is an experimental feature only." ++ echo ++ echo " Please post problems or success stories to" ++ echo " the glade-devel mailing list. Thank you." ++ echo "*****************************************************" ++fi ++ ++ ++ + GTK_DOC_CHECK(1.0) + + dnl gettext stuff ... there is no message catalog for libglade -- libglade +diff -urN libglade-2.4.2.orig/glade/glade-parser.c libglade-2.4.2/glade/glade-parser.c +--- libglade-2.4.2.orig/glade/glade-parser.c 2004-11-11 11:56:13.000000000 +0100 ++++ libglade-2.4.2/glade/glade-parser.c 2005-03-22 01:20:00.000000000 +0100 +@@ -34,7 +34,15 @@ + # define dgettext(Domain, String) (String) + #endif + +-#include ++#ifdef USE_GMARKUP_PARSER ++# include ++#else ++# include ++#endif ++ ++#ifdef USE_GMARKUP_PARSER ++# define xmlChar gchar ++#endif + + #include "glade-parser.h" + #include "glade-private.h" +@@ -508,7 +516,9 @@ + case PARSER_START: + if (!strcmp(name, "glade-interface")) { + state->state = PARSER_GLADE_INTERFACE; +-#if 0 ++ ++#ifndef USE_GMARKUP_PARSER ++ #if 0 + /* check for correct XML namespace */ + for (i = 0; attrs && attrs[i] != NULL; i += 2) { + if (!strcmp(attrs[i], "xmlns") && +@@ -518,7 +528,9 @@ + g_warning("unknown attribute `%s' for ", + attrs[i]); + } ++ #endif + #endif ++ + } else { + g_warning("Expected . Got <%s>.", name); + state->prev_state = state->state; +@@ -1063,12 +1075,18 @@ + } + } + ++#ifndef USE_GMARKUP_PARSER ++ + static xmlEntityPtr + glade_parser_get_entity(GladeParseState *state, const xmlChar *name) + { + return xmlGetPredefinedEntity(name); + } + ++#endif /* !defined(USE_GMARKUP_PARSER) */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + static void + glade_parser_warning(GladeParseState *state, const char *msg, ...) + { +@@ -1079,6 +1097,10 @@ + va_end(args); + } + ++#endif /* !defined(USE_GMARKUP_PARSER) */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + static void + glade_parser_error(GladeParseState *state, const char *msg, ...) + { +@@ -1089,6 +1111,10 @@ + va_end(args); + } + ++#endif /* !defined(USE_GMARKUP_PARSER) */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + static void + glade_parser_fatal_error(GladeParseState *state, const char *msg, ...) + { +@@ -1099,6 +1125,10 @@ + va_end(args); + } + ++#endif /* !defined(USE_GMARKUP_PARSER) */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + static xmlSAXHandler glade_parser = { + (internalSubsetSAXFunc)NULL, /* internalSubset */ + (isStandaloneSAXFunc)NULL, /* isStandalone */ +@@ -1126,6 +1156,82 @@ + (fatalErrorSAXFunc)glade_parser_fatal_error, /* fatalError */ + }; + ++#else /* USE_GMARKUP_PARSER */ ++ ++static void ++glade_parser_start_element_wrapper(GMarkupParseContext *context, ++ const gchar *name, ++ const gchar **attr_names, ++ const gchar **attr_values, ++ gpointer state, ++ GError **error) ++{ ++ guint i = 0; ++ ++ /* Pack attribute names/values from two separate ++ * arrays (GMarkupParser style) into one single ++ * array (libxml SAXParser style). This is not ++ * very efficient, but we do it to make the ++ * GMarkupParser code as little invasive as ++ * possible. */ ++ ++ while (attr_names[i] != NULL) { ++ ++i; ++ } ++ ++ if (1) ++ { ++ const gchar *attr[(i*2)+1]; ++ guint j, k; ++ ++ for (j=0, k=0; k < i; j += 2) ++ { ++ attr[j] = attr_names[k]; ++ attr[j+1] = attr_values[k]; ++ ++k; ++ } ++ attr[i*2] = NULL; ++ ++ glade_parser_start_element((GladeParseState*)state, name, attr); ++ } ++} ++ ++static void ++glade_parser_end_element_wrapper(GMarkupParseContext *context, ++ const gchar *name, ++ gpointer state, ++ GError **err) ++{ ++ glade_parser_end_element((GladeParseState*)state, name); ++} ++ ++static void ++glade_parser_characters_wrapper(GMarkupParseContext *context, ++ const gchar *chars, ++ gsize len, ++ gpointer state, ++ GError **err) ++{ ++ glade_parser_characters((GladeParseState*)state, chars, (int) len); ++} ++ ++static void ++glade_parser_error(GMarkupParseContext *context, GError *err, gpointer data) ++{ ++ g_log("Glade-Parser", G_LOG_LEVEL_CRITICAL, "%s", err->message); ++} ++ ++static const GMarkupParser glade_parser = { ++ glade_parser_start_element_wrapper, /* element open */ ++ glade_parser_end_element_wrapper, /* element close */ ++ glade_parser_characters_wrapper, /* text content */ ++ NULL, /* passthrough */ ++ glade_parser_error, /* parse error */ ++}; ++ ++#endif /* USE_GMARKUP_PARSER */ ++ ++ + static void + widget_info_free(GladeWidgetInfo *info) + { +@@ -1191,6 +1297,9 @@ + * + * Returns: the GladeInterface structure for the XML file. + */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + GladeInterface * + glade_parser_parse_file(const gchar *file, const gchar *domain) + { +@@ -1222,6 +1331,31 @@ + return state.interface; + } + ++#else /* defined(USE_GMARKUP_PARSER) */ ++ ++GladeInterface * ++glade_parser_parse_file(const gchar *file, const gchar *domain) ++{ ++ GladeInterface *interface; ++ GError *err = NULL; ++ gchar *content = NULL; ++ gsize clen; ++ ++ if (!g_file_get_contents(file, &content, &clen, &err)) { ++ g_warning("could not load glade file: %s", err->message); ++ g_error_free(err); ++ return NULL; ++ } ++ ++ interface = glade_parser_parse_buffer(content, (gint) clen, domain); ++ ++ g_free(content); ++ ++ return interface; ++} ++ ++#endif /* USE_GMARKUP_PARSER */ ++ + /** + * glade_parser_parse_buffer + * @buffer: a buffer in memory containing XML data. +@@ -1237,6 +1371,9 @@ + * + * Returns: the GladeInterface structure for the XML buffer. + */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + GladeInterface * + glade_parser_parse_buffer(const gchar *buffer, gint len, const gchar *domain) + { +@@ -1263,6 +1400,161 @@ + return state.interface; + } + ++#else /* defined(USE_GMARKUP_PARSER) */ ++ ++ ++static GladeInterface * ++glade_parser_parse_buffer_internal(const gchar *buffer, gint len, const gchar *domain) ++{ ++ GMarkupParseContext *context; ++ GladeParseState state = { 0 }; ++ GError *err = NULL; ++ ++ state.interface = NULL; ++ if (domain) ++ state.domain = domain; ++ else ++ state.domain = textdomain(NULL); ++ ++ /* FIXME: This strstr() is not safe, as it ignores the len ++ * argument and assumes the buffer is NUL-terminated */ ++ if (strstr(buffer, "message); ++ g_error_free(err); ++ if (state.interface) ++ glade_interface_destroy (state.interface); ++ return NULL; ++ } ++ ++ glade_parser_end_document(&state); ++ ++ if (state.state != PARSER_FINISH) { ++ g_warning("did not finish in PARSER_FINISH state!"); ++ ++ if (state.interface) ++ glade_interface_destroy(state.interface); ++ ++ return NULL; ++ } ++ ++ return state.interface; ++} ++ ++struct _gzip_rfc1952_hdr ++{ ++ guint8 id1, id2, cm, flags; ++ guint32 mtime; ++ guint8 xflags; ++ guint8 os; ++}; ++ ++static GladeInterface * ++glade_parser_parse_gzipped_buffer(const gchar *buffer, gint len, const gchar *domain) ++{ ++ struct _gzip_rfc1952_hdr *hdr = (struct _gzip_rfc1952_hdr*)buffer; ++ struct z_stream_s zstream; ++ GladeInterface *interface; ++ const guint8 *cbuf; /* start of compressed data */ ++ guint8 *decompress_buf; ++ gulong decompress_len = 0; ++ gint ret; ++ ++ g_assert(hdr != NULL && hdr->id1 == 0x1f && hdr->id2 == 0x8b); ++ ++ if (hdr->cm != Z_DEFLATED) { ++ g_warning("Unknown decompression method %u", (guint) hdr->cm); ++ return NULL; ++ } ++ ++ /* Uncompressed size (modulo 2^32) is last ++ * 4 bytes of gzipped file, and little endian. ++ * See RFC 1952 */ ++ decompress_len = GUINT32_FROM_LE(*((guint32*)(((guint8*)buffer) + len - 4))); ++ ++ /* paranoid mode: glade files > 5MB are unlikely */ ++ g_return_val_if_fail(decompress_len < 5*1024*1024, NULL); ++ ++ decompress_buf = g_malloc0(decompress_len + 1); /* +1 for NUL-terminator */ ++ ++ /* find start of compressed data, skipping header stuff */ ++ cbuf = (guint8*)buffer + 10; ++ if (hdr->flags & 0x04) { ++ guint16 xlen = GUINT16_FROM_LE(*((guint16*)cbuf)); ++ cbuf += xlen + 2; ++ } ++ if (hdr->flags & 0x08) { ++ guint16 onamelen = strlen(cbuf); ++ cbuf += onamelen + 1; ++ } ++ if (hdr->flags & 0x10) { ++ guint16 commentlen = strlen(cbuf); ++ cbuf += commentlen + 1; ++ } ++ if (hdr->flags & 0x02) ++ { ++ cbuf += 2; /* skip header CRC16 */ ++ } ++ ++ zstream.next_in = (void*)cbuf; ++ zstream.avail_in = (uLongf) len - ((void*)cbuf-(void*)buffer) - 4 - 4 +1; ++ zstream.next_out = decompress_buf; ++ zstream.avail_out= decompress_len; ++ zstream.zalloc = Z_NULL; ++ zstream.zfree = Z_NULL; ++ zstream.opaque = Z_NULL; ++ ++ ret = inflateInit2(&zstream, -MAX_WBITS); ++ ++ if (ret != Z_OK) { ++ g_warning("inflateInit2() failed. zlib error code: %d", ret); ++ g_free(decompress_buf); ++ return NULL; ++ } ++ ++ ret = inflate(&zstream, Z_FINISH); ++ ++ if (ret != Z_STREAM_END) { ++ g_warning("zlib decompression failed. zlib error code: %d", ret); ++ g_free(decompress_buf); ++ return NULL; ++ } ++ ++ interface = glade_parser_parse_buffer_internal(decompress_buf, decompress_len, domain); ++ ++ g_free(decompress_buf); ++ ++ return interface; ++} ++ ++GladeInterface * ++glade_parser_parse_buffer(const gchar *buffer, gint len, const gchar *domain) ++{ ++ g_return_val_if_fail(buffer != NULL, NULL); ++ g_return_val_if_fail(len > 0, NULL); ++ ++ /* Check if buffer is gzipped */ ++ if (buffer[0] == 0x1f && buffer[1] == (gchar)0x8b) { ++ return glade_parser_parse_gzipped_buffer(buffer, len, domain); ++ } ++ ++ /* Buffer is cleartext. */ ++ return glade_parser_parse_buffer_internal(buffer, len, domain); ++} ++ ++#endif /* USE_GMARKUP_PARSER */ ++ ++ ++#ifndef USE_GMARKUP_PARSER ++ + static void + dump_widget(xmlNode *parent, GladeWidgetInfo *info, gint indent) + { +@@ -1382,6 +1674,8 @@ + xmlNodeAddContent(widget, " "); + } + ++#endif /* !defined(USE_GMARKUP_PARSER) */ ++ + /** + * glade_interface_dump + * @interface: the GladeInterface +@@ -1390,6 +1684,9 @@ + * This function dumps the contents of a GladeInterface into a file as + * XML. It is intended mainly as a debugging tool. + */ ++ ++#ifndef USE_GMARKUP_PARSER ++ + void + glade_interface_dump(GladeInterface *interface, const gchar *filename) + { +@@ -1428,6 +1725,17 @@ + xmlFreeDoc(doc); + } + ++#else /* defined(USE_GMARKUP_PARSER) */ ++ ++void ++glade_interface_dump(GladeInterface *interface, const gchar *filename) ++{ ++ g_warning("glade_interface_dump() is only available with libxml2."); ++} ++ ++#endif /* USE_GMARKUP_PARSER */ ++ ++ + #if 0 + int + main(int argc, char **argv) { +diff -urN libglade-2.4.2.orig/libglade-2.0.pc.in libglade-2.4.2/libglade-2.0.pc.in +--- libglade-2.4.2.orig/libglade-2.0.pc.in 2001-12-12 15:28:23.000000000 +0100 ++++ libglade-2.4.2/libglade-2.0.pc.in 2005-03-22 01:20:00.000000000 +0100 +@@ -11,7 +11,7 @@ + Name: Libglade + Description: a library for dynamically loading GLADE interface files + Version: @VERSION@ +-Requires: gtk+-2.0 libxml-2.0 ++Requires: gtk+-2.0 @PKGCFG_REQUIRE_LIBXML2@ + Libs: -L${libdir} -lglade-2.0 + Cflags: -I${includedir}/libglade-2.0 + diff --git a/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch b/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch new file mode 100644 index 000000000..b5b2ec453 --- /dev/null +++ b/recipes-gnome/libglade/libglade-2.6.4/python_environment.patch @@ -0,0 +1,14 @@ +Using @PYTHON@ for this path would result in the build system python being +referred to. Instead we want to locate python from the environment. + +Upstream-Status: Inappropriate [configuration] + +diff -ruN libglade-2.6.4-orig//libglade-convert.in libglade-2.6.4/libglade-convert.in +--- libglade-2.6.4-orig//libglade-convert.in 2011-09-22 10:18:28.991164003 +0800 ++++ libglade-2.6.4/libglade-convert.in 2011-09-22 10:18:55.431164003 +0800 +@@ -1,4 +1,4 @@ +-#!@PYTHON@ ++#!/usr/bin/env python + # -*- mode: python -*- + + # yes, this requires python 2.x and an XML parser module (eg. PyExpat) diff --git a/recipes-gnome/libglade/libglade_2.6.4.bb b/recipes-gnome/libglade/libglade_2.6.4.bb new file mode 100644 index 000000000..2823a91e9 --- /dev/null +++ b/recipes-gnome/libglade/libglade_2.6.4.bb @@ -0,0 +1,35 @@ +SUMMARY = "Runtime support for the GTK+ interface builder" +HOMEPAGE = "http://library.gnome.org/devel/libglade/" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2 & LGPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ + file://glade/glade.h;endline=22;md5=a04f461c964ba4b57a172d1fbcd8f8fc \ + file://glade/glade-gtk.c;endline=22;md5=766f993433e2642fec87936d319990ff" + +SECTION = "libs" +PR = "r5" +DEPENDS = "zlib gdk-pixbuf gtk+ glib-2.0-native" + +inherit autotools pkgconfig gnomebase gtk-doc distro_features_check +ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +GNOME_COMPRESS_TYPE="bz2" + +SRC_URI += " \ + file://glade-cruft.patch \ + file://no-xml2.patch \ + file://python_environment.patch \ + file://0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch \ +" + +SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" +SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" + +EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc" + +CFLAGS += "-lz -lgmodule-2.0" + +PACKAGES += " ${PN}-data" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd" +FILES_${PN}-dev += "${bindir}/libglade-convert" diff --git a/recipes-security/selinux/files/0001-semodule-Stack-size-limit-check-for-NILRT.patch b/recipes-security/selinux/files/0001-semodule-Stack-size-limit-check-for-NILRT.patch deleted file mode 100644 index ff3038ff3..000000000 --- a/recipes-security/selinux/files/0001-semodule-Stack-size-limit-check-for-NILRT.patch +++ /dev/null @@ -1,62 +0,0 @@ -From aceda0d595920c861ab568c55c4f1c6be3fade08 Mon Sep 17 00:00:00 2001 -From: Ioan-Adrian Ratiu -Date: Wed, 3 Feb 2016 16:20:30 +0200 -Subject: [PATCH] semodule: Stack size limit check for NILRT - -Verify the stack size limit is sufficient to run semodule in order to -avoid unpleasant overflow errors. Immediately exit with error message -otherwise. - -Upstream-Status: Inappropriate (NI-specific) - -Signed-off-by: Haris Okanovic -Signed-off-by: Ioan-Adrian Ratiu ---- - semodule/semodule.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - -diff --git a/semodule/semodule.c b/semodule/semodule.c -index bcfaa2b..2e2540a 100644 ---- a/semodule/semodule.c -+++ b/semodule/semodule.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include - -@@ -107,6 +108,21 @@ static void set_store_root(char *path) - exit(1); - } - -+/* Verify there's enough stack space to run this program */ -+static void check_stack_size(void) -+{ -+ struct rlimit rl; -+ if(getrlimit(RLIMIT_STACK, &rl) != 0) { -+ fprintf(stderr, "Failed to get stack size limit.\n"); -+ exit(1); -+ } -+ if(rl.rlim_cur < 1024*1024) { -+ fprintf(stderr, "Stack is too small.\n" -+ "Run `ulimit -s 1024` to increase stack size limit to 1 MB before running this program.\n"); -+ exit(1); -+ } -+} -+ - /* Establish signal handlers for the process. */ - static void create_signal_handlers(void) - { -@@ -342,6 +358,7 @@ int main(int argc, char *argv[]) - int result; - int status = EXIT_FAILURE; - const char *genhomedirconargv[] = { "genhomedircon", "-B", "-n" }; -+ check_stack_size(); - create_signal_handlers(); - if (strcmp(basename(argv[0]), "genhomedircon") == 0) { - argc = 3; --- -2.8.2 - diff --git a/recipes-security/selinux/policycoreutils_2.%.bbappend b/recipes-security/selinux/policycoreutils_2.%.bbappend deleted file mode 100644 index f8a2d5d1a..000000000 --- a/recipes-security/selinux/policycoreutils_2.%.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "\ - file://0001-semodule-Stack-size-limit-check-for-NILRT.patch \ -" diff --git a/recipes-support/libcap/libcap/0001-Fix-tyop-in-a-comment.patch b/recipes-support/libcap/libcap/0001-Fix-tyop-in-a-comment.patch deleted file mode 100644 index a8f9e9881..000000000 --- a/recipes-support/libcap/libcap/0001-Fix-tyop-in-a-comment.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1f52c8a50305ab07b029008a8c7d6318355944b3 Mon Sep 17 00:00:00 2001 -From: Andrew G Morgan -Date: Sun, 31 Jan 2016 13:29:23 -0800 -Subject: [PATCH 1/4] Fix tyop in a comment. - -Thanks to P.J.Opalinski for noticing it. - -Signed-off-by: Andrew G Morgan ---- - libcap/cap_file.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libcap/cap_file.c b/libcap/cap_file.c -index 40756ea..76aac8c 100644 ---- a/libcap/cap_file.c -+++ b/libcap/cap_file.c -@@ -13,7 +13,7 @@ - /* - * We hardcode the prototypes for the Linux system calls here since - * there are no libcap library APIs that expose the user to these -- * details, and that way we don't need to foce clients to link any -+ * details, and that way we don't need to force clients to link any - * other libraries to access them. - */ - extern ssize_t getxattr(const char *, const char *, void *, size_t); --- -2.13.2 - diff --git a/recipes-support/libcap/libcap/0002-Add-something-to-run-libcap-s-quicktest-tests-agains.patch b/recipes-support/libcap/libcap/0002-Add-something-to-run-libcap-s-quicktest-tests-agains.patch deleted file mode 100644 index e70bfa7f6..000000000 --- a/recipes-support/libcap/libcap/0002-Add-something-to-run-libcap-s-quicktest-tests-agains.patch +++ /dev/null @@ -1,205 +0,0 @@ -From dce069b617cf5e42fde707196eaf2ee8d62bc96c Mon Sep 17 00:00:00 2001 -From: "Andrew G. Morgan" -Date: Sat, 6 Feb 2016 19:42:27 -0800 -Subject: [PATCH 2/4] Add something to run libcap's quicktest tests against - development kernel. - -The kdebug directory requires qemu to run and expects the kernel -to be compiled with the running architecture. My setup has the kernel -sources as a peer to the libcap directory so kdebug assumes that too. - -Signed-off-by: Andrew G. Morgan ---- - Makefile | 3 ++- - kdebug/Makefile | 14 +++++++++++ - kdebug/test-bash.sh | 4 +++ - kdebug/test-init.sh | 14 +++++++++++ - kdebug/test-kernel.sh | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ - kdebug/test-passwd | 2 ++ - kdebug/test-prompt.sh | 2 ++ - progs/quicktest.sh | 3 ++- - 8 files changed, 107 insertions(+), 2 deletions(-) - create mode 100644 kdebug/Makefile - create mode 100644 kdebug/test-bash.sh - create mode 100644 kdebug/test-init.sh - create mode 100755 kdebug/test-kernel.sh - create mode 100644 kdebug/test-passwd - create mode 100644 kdebug/test-prompt.sh - -diff --git a/Makefile b/Makefile -index 124d10d..ad58c3a 100644 ---- a/Makefile -+++ b/Makefile -@@ -8,13 +8,14 @@ include Make.Rules - # flags - # - --all install clean: %: %-here -+all install clean kdebug: %: %-here - $(MAKE) -C libcap $@ - ifneq ($(PAM_CAP),no) - $(MAKE) -C pam_cap $@ - endif - $(MAKE) -C progs $@ - $(MAKE) -C doc $@ -+ $(MAKE) -C kdebug $@ - - all-here: - -diff --git a/kdebug/Makefile b/kdebug/Makefile -new file mode 100644 -index 0000000..c710050 ---- /dev/null -+++ b/kdebug/Makefile -@@ -0,0 +1,14 @@ -+topdir=$(shell pwd)/.. -+include ../Make.Rules -+ -+test: -+ ./test-kernel.sh -+ -+all: -+ @echo cd to kdebug to test a kernel build -+ -+install: -+ -+clean: -+ $(LOCALCLEAN) -+ rm -f fs.conf initramfs.img -diff --git a/kdebug/test-bash.sh b/kdebug/test-bash.sh -new file mode 100644 -index 0000000..2777b21 ---- /dev/null -+++ b/kdebug/test-bash.sh -@@ -0,0 +1,4 @@ -+#!/bin/sh -+# bash is used in various headers so we need a wrapper to invoke sh -+# instead. -+exec sh "$@" -diff --git a/kdebug/test-init.sh b/kdebug/test-init.sh -new file mode 100644 -index 0000000..4b55b51 ---- /dev/null -+++ b/kdebug/test-init.sh -@@ -0,0 +1,14 @@ -+#!/bin/sh -+PATH=/bin -+ -+echo -n "Mounting filesystems ... " -+mount -t proc proc /proc -+mount -t devtmpfs dev /dev -+mount -t sysfs sys /sys -+mount -t devpts pts /dev/pts -+echo done -+ -+echo Hello, World -+cd /root -+./quicktest.sh -+sh -i -diff --git a/kdebug/test-kernel.sh b/kdebug/test-kernel.sh -new file mode 100755 -index 0000000..c8ce144 ---- /dev/null -+++ b/kdebug/test-kernel.sh -@@ -0,0 +1,67 @@ -+#!/bin/bash -+# The following is a synthesis of info in: -+# -+# http://vmsplice.net/~stefan/stefanha-kernel-recipes-2015.pdf -+# http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/README -+# -+KBASE=../../linux -+#APPEND="console=ttyS0" -+ -+function die { -+ echo "$*" -+ exit 1 -+} -+ -+pushd .. -+make || die "failed to make libcap tree" -+popd -+ -+# Assumes desired make *config (eg. make defconfig) is already done. -+pushd $KBASE -+pwd -+make V=1 all || die "failed to build kernel: $0" -+popd -+ -+HERE=$(/bin/pwd) -+ -+cat > fs.conf <> fs.conf -+done -+ -+UCOMMANDS="id cut" -+for f in $UCOMMANDS; do -+ echo slink /usr/bin/$f /sbin/busybox 0755 0 0 >> fs.conf -+done -+ -+$KBASE/usr/gen_init_cpio fs.conf | gzip -9 > initramfs.img -+ -+KERNEL=$KBASE/arch/x86_64/boot/bzImage -+ -+qemu-system-$(uname -m) -m 1024 \ -+ -kernel $KERNEL \ -+ -initrd initramfs.img \ -+ -append "$APPEND" -diff --git a/kdebug/test-passwd b/kdebug/test-passwd -new file mode 100644 -index 0000000..4fa92a4 ---- /dev/null -+++ b/kdebug/test-passwd -@@ -0,0 +1,2 @@ -+root:x:0:0:root:/root:/bin/bash -+nobody:x:99:99:Nobody:/:/sbin/nologin -diff --git a/kdebug/test-prompt.sh b/kdebug/test-prompt.sh -new file mode 100644 -index 0000000..1c19c16 ---- /dev/null -+++ b/kdebug/test-prompt.sh -@@ -0,0 +1,2 @@ -+#!/bin/sh -+echo -n "$(pwd)# " -diff --git a/progs/quicktest.sh b/progs/quicktest.sh -index 48c9b9e..e8b2c8e 100755 ---- a/progs/quicktest.sh -+++ b/progs/quicktest.sh -@@ -122,8 +122,9 @@ rm -f ./privileged - # test that we do not support capabilities on setuid shell-scripts - cat > hack.sh <&1 | cut -d: -f2) -+caps=\$(./getpcaps \$mypid 2>&1 | /usr/bin/cut -d: -f2) - if [ "\$caps" != " =" ]; then - echo "Shell script got [\$caps] - you should upgrade your kernel" - exit 1 --- -2.13.2 - diff --git a/recipes-support/libcap/libcap/0003-Add-initial-support-for-the-ambient-set.patch b/recipes-support/libcap/libcap/0003-Add-initial-support-for-the-ambient-set.patch deleted file mode 100644 index bdd4ec4dc..000000000 --- a/recipes-support/libcap/libcap/0003-Add-initial-support-for-the-ambient-set.patch +++ /dev/null @@ -1,404 +0,0 @@ -From 0f0eca489e979b4a8526e521f962455e474a27a0 Mon Sep 17 00:00:00 2001 -From: "Andrew G. Morgan" -Date: Sat, 6 Feb 2016 19:49:07 -0800 -Subject: [PATCH 3/4] Add initial support for the ambient set. - -The ambient set is some strangeness associated with trying to revive -naive inheritance. While personally not a fan of this feature, I -recognize it is in the kernel so libcap now supports it with -three new functions: - - int cap_get_ambient(cap_value_t cap) - int cap_set_ambient(cap_value_t cap, cap_flag_value_t set) - int cap_reset_ambient(void) - -Signed-off-by: Andrew G. Morgan ---- - libcap/cap_proc.c | 69 ++++++++++++++- - libcap/include/sys/capability.h | 6 +- - libcap/include/uapi/linux/prctl.h | 48 +++++++++++ - progs/capsh.c | 174 ++++++++++++++++++++++---------------- - 4 files changed, 219 insertions(+), 78 deletions(-) - -diff --git a/libcap/cap_proc.c b/libcap/cap_proc.c -index 8ecb57a..ffa0d91 100644 ---- a/libcap/cap_proc.c -+++ b/libcap/cap_proc.c -@@ -105,13 +105,20 @@ int capsetp(pid_t pid, cap_t cap_d) - return error; - } - -+/* the kernel api requires unsigned long arguments */ -+#define pr_arg(x) ((unsigned long) x) -+ - /* get a capability from the bounding set */ - - int cap_get_bound(cap_value_t cap) - { - int result; - -- result = prctl(PR_CAPBSET_READ, cap); -+ result = prctl(PR_CAPBSET_READ, pr_arg(cap)); -+ if (result < 0) { -+ errno = -result; -+ return -1; -+ } - return result; - } - -@@ -121,6 +128,64 @@ int cap_drop_bound(cap_value_t cap) - { - int result; - -- result = prctl(PR_CAPBSET_DROP, cap); -+ result = prctl(PR_CAPBSET_DROP, pr_arg(cap)); -+ if (result < 0) { -+ errno = -result; -+ return -1; -+ } -+ return result; -+} -+ -+/* get a capability from the ambient set */ -+ -+int cap_get_ambient(cap_value_t cap) -+{ -+ int result; -+ result = prctl(PR_CAP_AMBIENT, pr_arg(PR_CAP_AMBIENT_IS_SET), -+ pr_arg(cap), pr_arg(0), pr_arg(0)); -+ if (result < 0) { -+ errno = -result; -+ return -1; -+ } -+ return result; -+} -+ -+/* modify a single ambient capability value */ -+ -+int cap_set_ambient(cap_value_t cap, cap_flag_value_t set) -+{ -+ int result, val; -+ switch (set) { -+ case CAP_SET: -+ val = PR_CAP_AMBIENT_RAISE; -+ break; -+ case CAP_CLEAR: -+ val = PR_CAP_AMBIENT_LOWER; -+ break; -+ default: -+ errno = EINVAL; -+ return -1; -+ } -+ result = prctl(PR_CAP_AMBIENT, pr_arg(PR_CAP_AMBIENT_RAISE), -+ pr_arg(cap), pr_arg(val), pr_arg(0)); -+ if (result < 0) { -+ errno = -result; -+ return -1; -+ } -+ return result; -+} -+ -+/* erase all ambient capabilities */ -+ -+int cap_reset_ambient() -+{ -+ int result; -+ -+ result = prctl(PR_CAP_AMBIENT, pr_arg(PR_CAP_AMBIENT_CLEAR_ALL), -+ pr_arg(0), pr_arg(0), pr_arg(0)); -+ if (result < 0) { -+ errno = -result; -+ return -1; -+ } - return result; - } -diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h -index dddc75b..0976fa7 100644 ---- a/libcap/include/sys/capability.h -+++ b/libcap/include/sys/capability.h -@@ -92,9 +92,13 @@ extern int cap_set_proc(cap_t); - - extern int cap_get_bound(cap_value_t); - extern int cap_drop_bound(cap_value_t); -- - #define CAP_IS_SUPPORTED(cap) (cap_get_bound(cap) >= 0) - -+extern int cap_get_ambient(cap_value_t); -+extern int cap_set_ambient(cap_value_t, cap_flag_value_t); -+extern int cap_reset_ambient(void); -+#define CAP_AMBIENT_SUPPORTED() (cap_get_ambient(CAP_CHOWN) >= 0) -+ - /* libcap/cap_extint.c */ - extern ssize_t cap_size(cap_t); - extern ssize_t cap_copy_ext(void *, cap_t, ssize_t); -diff --git a/libcap/include/uapi/linux/prctl.h b/libcap/include/uapi/linux/prctl.h -index 289760f..a8d0759 100644 ---- a/libcap/include/uapi/linux/prctl.h -+++ b/libcap/include/uapi/linux/prctl.h -@@ -1,6 +1,8 @@ - #ifndef _LINUX_PRCTL_H - #define _LINUX_PRCTL_H - -+#include -+ - /* Values to pass as first argument to prctl() */ - - #define PR_SET_PDEATHSIG 1 /* Second arg is a signal */ -@@ -119,6 +121,31 @@ - # define PR_SET_MM_ENV_END 11 - # define PR_SET_MM_AUXV 12 - # define PR_SET_MM_EXE_FILE 13 -+# define PR_SET_MM_MAP 14 -+# define PR_SET_MM_MAP_SIZE 15 -+ -+/* -+ * This structure provides new memory descriptor -+ * map which mostly modifies /proc/pid/stat[m] -+ * output for a task. This mostly done in a -+ * sake of checkpoint/restore functionality. -+ */ -+struct prctl_mm_map { -+ __u64 start_code; /* code section bounds */ -+ __u64 end_code; -+ __u64 start_data; /* data section bounds */ -+ __u64 end_data; -+ __u64 start_brk; /* heap for brk() syscall */ -+ __u64 brk; -+ __u64 start_stack; /* stack starts at */ -+ __u64 arg_start; /* command line arguments bounds */ -+ __u64 arg_end; -+ __u64 env_start; /* environment variables bounds */ -+ __u64 env_end; -+ __u64 *auxv; /* auxiliary vector */ -+ __u32 auxv_size; /* vector size */ -+ __u32 exe_fd; /* /proc/$pid/exe link file */ -+}; - - /* - * Set specific pid that is allowed to ptrace the current task. -@@ -149,4 +176,25 @@ - - #define PR_GET_TID_ADDRESS 40 - -+#define PR_SET_THP_DISABLE 41 -+#define PR_GET_THP_DISABLE 42 -+ -+/* -+ * Tell the kernel to start/stop helping userspace manage bounds tables. -+ */ -+#define PR_MPX_ENABLE_MANAGEMENT 43 -+#define PR_MPX_DISABLE_MANAGEMENT 44 -+ -+#define PR_SET_FP_MODE 45 -+#define PR_GET_FP_MODE 46 -+# define PR_FP_MODE_FR (1 << 0) /* 64b FP registers */ -+# define PR_FP_MODE_FRE (1 << 1) /* 32b compatibility */ -+ -+/* Control the ambient capability set */ -+#define PR_CAP_AMBIENT 47 -+# define PR_CAP_AMBIENT_IS_SET 1 -+# define PR_CAP_AMBIENT_RAISE 2 -+# define PR_CAP_AMBIENT_LOWER 3 -+# define PR_CAP_AMBIENT_CLEAR_ALL 4 -+ - #endif /* _LINUX_PRCTL_H */ -diff --git a/progs/capsh.c b/progs/capsh.c -index 3ceadcd..9c907a7 100644 ---- a/progs/capsh.c -+++ b/progs/capsh.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2008-11 Andrew G. Morgan -+ * Copyright (c) 2008-11,16 Andrew G. Morgan - * - * This is a simple 'bash' wrapper program that can be used to - * raise and lower both the bset and pI capabilities before invoking -@@ -43,6 +43,103 @@ static char *binary(unsigned long value) - return string + i; - } - -+static void display_prctl_set(const char *name, int (*fn)(cap_value_t)) -+{ -+ unsigned cap; -+ const char *sep; -+ int set; -+ -+ printf("%s set =", name); -+ for (sep = "", cap=0; (set = fn(cap)) >= 0; cap++) { -+ char *ptr; -+ if (!set) { -+ continue; -+ } -+ -+ ptr = cap_to_name(cap); -+ if (ptr == NULL) { -+ printf("%s%u", sep, cap); -+ } else { -+ printf("%s%s", sep, ptr); -+ cap_free(ptr); -+ } -+ sep = ","; -+ } -+ if (!cap) { -+ printf(" \n"); -+ } else { -+ printf("\n"); -+ } -+} -+ -+/* arg_print displays the current capability state of the process */ -+static void arg_print(void) -+{ -+ int set, status, j; -+ cap_t all; -+ char *text; -+ const char *sep; -+ struct group *g; -+ gid_t groups[MAX_GROUPS], gid; -+ uid_t uid; -+ struct passwd *u; -+ -+ all = cap_get_proc(); -+ text = cap_to_text(all, NULL); -+ printf("Current: %s\n", text); -+ cap_free(text); -+ cap_free(all); -+ -+ display_prctl_set("Bounding", cap_get_bound); -+ display_prctl_set("Ambient", cap_get_ambient); -+ set = prctl(PR_GET_SECUREBITS); -+ if (set >= 0) { -+ const char *b; -+ b = binary(set); /* use verilog convention for binary string */ -+ printf("Securebits: 0%o/0x%x/%u'b%s\n", set, set, -+ (unsigned) strlen(b), b); -+ printf(" secure-noroot: %s (%s)\n", -+ (set & SECBIT_NOROOT) ? "yes":"no", -+ (set & SECBIT_NOROOT_LOCKED) ? "locked":"unlocked"); -+ printf(" secure-no-suid-fixup: %s (%s)\n", -+ (set & SECBIT_NO_SETUID_FIXUP) ? "yes":"no", -+ (set & SECBIT_NO_SETUID_FIXUP_LOCKED) ? "locked":"unlocked"); -+ printf(" secure-keep-caps: %s (%s)\n", -+ (set & SECBIT_KEEP_CAPS) ? "yes":"no", -+ (set & SECBIT_KEEP_CAPS_LOCKED) ? "locked":"unlocked"); -+ if (CAP_AMBIENT_SUPPORTED()) { -+ printf(" secure-no-ambient-raise: %s (%s)\n", -+ (set & SECBIT_NO_CAP_AMBIENT_RAISE) ? "yes":"no", -+ (set & SECBIT_NO_CAP_AMBIENT_RAISE_LOCKED) ? -+ "locked":"unlocked"); -+ } -+ } else { -+ printf("[Securebits ABI not supported]\n"); -+ set = prctl(PR_GET_KEEPCAPS); -+ if (set >= 0) { -+ printf(" prctl-keep-caps: %s (locking not supported)\n", -+ set ? "yes":"no"); -+ } else { -+ printf("[Keepcaps ABI not supported]\n"); -+ } -+ } -+ uid = getuid(); -+ u = getpwuid(uid); -+ printf("uid=%u(%s)\n", getuid(), u ? u->pw_name : "???"); -+ gid = getgid(); -+ g = getgrgid(gid); -+ printf("gid=%u(%s)\n", gid, g ? g->gr_name : "???"); -+ printf("groups="); -+ status = getgroups(MAX_GROUPS, groups); -+ sep = ""; -+ for (j=0; j < status; j++) { -+ g = getgrgid(groups[j]); -+ printf("%s%u(%s)", sep, groups[j], g ? g->gr_name : "???"); -+ sep = ","; -+ } -+ printf("\n"); -+} -+ - int main(int argc, char *argv[], char *envp[]) - { - pid_t child; -@@ -482,80 +579,7 @@ int main(int argc, char *argv[], char *envp[]) - exit(1); - } - } else if (!strcmp("--print", argv[i])) { -- unsigned cap; -- int set, status, j; -- cap_t all; -- char *text; -- const char *sep; -- struct group *g; -- gid_t groups[MAX_GROUPS], gid; -- uid_t uid; -- struct passwd *u; -- -- all = cap_get_proc(); -- text = cap_to_text(all, NULL); -- printf("Current: %s\n", text); -- cap_free(text); -- cap_free(all); -- -- printf("Bounding set ="); -- sep = ""; -- for (cap=0; (set = cap_get_bound(cap)) >= 0; cap++) { -- char *ptr; -- if (!set) { -- continue; -- } -- -- ptr = cap_to_name(cap); -- if (ptr == NULL) { -- printf("%s%u", sep, cap); -- } else { -- printf("%s%s", sep, ptr); -- cap_free(ptr); -- } -- sep = ","; -- } -- printf("\n"); -- set = prctl(PR_GET_SECUREBITS); -- if (set >= 0) { -- const char *b; -- b = binary(set); /* use verilog convention for binary string */ -- printf("Securebits: 0%o/0x%x/%u'b%s\n", set, set, -- (unsigned) strlen(b), b); -- printf(" secure-noroot: %s (%s)\n", -- (set & 1) ? "yes":"no", -- (set & 2) ? "locked":"unlocked"); -- printf(" secure-no-suid-fixup: %s (%s)\n", -- (set & 4) ? "yes":"no", -- (set & 8) ? "locked":"unlocked"); -- printf(" secure-keep-caps: %s (%s)\n", -- (set & 16) ? "yes":"no", -- (set & 32) ? "locked":"unlocked"); -- } else { -- printf("[Securebits ABI not supported]\n"); -- set = prctl(PR_GET_KEEPCAPS); -- if (set >= 0) { -- printf(" prctl-keep-caps: %s (locking not supported)\n", -- set ? "yes":"no"); -- } else { -- printf("[Keepcaps ABI not supported]\n"); -- } -- } -- uid = getuid(); -- u = getpwuid(uid); -- printf("uid=%u(%s)\n", getuid(), u ? u->pw_name : "???"); -- gid = getgid(); -- g = getgrgid(gid); -- printf("gid=%u(%s)\n", gid, g ? g->gr_name : "???"); -- printf("groups="); -- status = getgroups(MAX_GROUPS, groups); -- sep = ""; -- for (j=0; j < status; j++) { -- g = getgrgid(groups[j]); -- printf("%s%u(%s)", sep, groups[j], g ? g->gr_name : "???"); -- sep = ","; -- } -- printf("\n"); -+ arg_print(); - } else if ((!strcmp("--", argv[i])) || (!strcmp("==", argv[i]))) { - argv[i] = strdup(argv[i][0] == '-' ? "/bin/bash" : argv[0]); - argv[argc] = NULL; --- -2.13.2 - diff --git a/recipes-support/libcap/libcap/0004-Clean-up-ambient-support-and-add-a-smoke-test-for-th.patch b/recipes-support/libcap/libcap/0004-Clean-up-ambient-support-and-add-a-smoke-test-for-th.patch deleted file mode 100644 index 59ed22f47..000000000 --- a/recipes-support/libcap/libcap/0004-Clean-up-ambient-support-and-add-a-smoke-test-for-th.patch +++ /dev/null @@ -1,442 +0,0 @@ -From 8c67abc3f5cfa8310dae21e5db464fd990cb71a2 Mon Sep 17 00:00:00 2001 -From: "Andrew G. Morgan" -Date: Sun, 7 Feb 2016 20:22:35 -0800 -Subject: [PATCH 4/4] Clean up ambient support and add a smoke test for them. - -Signed-off-by: Andrew G. Morgan ---- - kdebug/test-kernel.sh | 2 +- - libcap/cap_proc.c | 4 +- - progs/capsh.c | 248 ++++++++++++++++++++++++++++++++++++-------------- - progs/quicktest.sh | 59 +++++++++--- - 4 files changed, 230 insertions(+), 83 deletions(-) - -diff --git a/kdebug/test-kernel.sh b/kdebug/test-kernel.sh -index c8ce144..d480a63 100755 ---- a/kdebug/test-kernel.sh -+++ b/kdebug/test-kernel.sh -@@ -47,7 +47,7 @@ file /root/capsh $HERE/../progs/capsh 0755 0 0 - file /root/getpcaps $HERE/../progs/getpcaps 0755 0 0 - EOF - --COMMANDS="ls ln cp id pwd mkdir rmdir cat rm sh mount umount chmod less" -+COMMANDS="ls ln cp dmesg id pwd mkdir rmdir cat rm sh mount umount chmod less vi" - for f in $COMMANDS; do - echo slink /bin/$f /sbin/busybox 0755 0 0 >> fs.conf - done -diff --git a/libcap/cap_proc.c b/libcap/cap_proc.c -index ffa0d91..f70b0e3 100644 ---- a/libcap/cap_proc.c -+++ b/libcap/cap_proc.c -@@ -166,8 +166,8 @@ int cap_set_ambient(cap_value_t cap, cap_flag_value_t set) - errno = EINVAL; - return -1; - } -- result = prctl(PR_CAP_AMBIENT, pr_arg(PR_CAP_AMBIENT_RAISE), -- pr_arg(cap), pr_arg(val), pr_arg(0)); -+ result = prctl(PR_CAP_AMBIENT, pr_arg(val), pr_arg(cap), -+ pr_arg(0), pr_arg(0)); - if (result < 0) { - errno = -result; - return -1; -diff --git a/progs/capsh.c b/progs/capsh.c -index 9c907a7..a1d6e2b 100644 ---- a/progs/capsh.c -+++ b/progs/capsh.c -@@ -26,9 +26,6 @@ - - #define MAX_GROUPS 100 /* max number of supplementary groups for user */ - --static const cap_value_t raise_setpcap[1] = { CAP_SETPCAP }; --static const cap_value_t raise_chroot[1] = { CAP_SYS_CHROOT }; -- - static char *binary(unsigned long value) - { - static char string[8*sizeof(unsigned long) + 1]; -@@ -140,85 +137,199 @@ static void arg_print(void) - printf("\n"); - } - --int main(int argc, char *argv[], char *envp[]) -+static const cap_value_t raise_setpcap[1] = { CAP_SETPCAP }; -+static const cap_value_t raise_chroot[1] = { CAP_SYS_CHROOT }; -+ -+static void push_pcap(cap_t *orig_p, cap_t *raised_for_setpcap_p) - { -- pid_t child; -- unsigned i; -+ /* -+ * We need to do this here because --inh=XXX may have reset -+ * orig and it isn't until we are within the --drop code that -+ * we know what the prevailing (orig) pI value is. -+ */ -+ *orig_p = cap_get_proc(); -+ if (NULL == *orig_p) { -+ perror("Capabilities not available"); -+ exit(1); -+ } - -- child = 0; -+ *raised_for_setpcap_p = cap_dup(*orig_p); -+ if (NULL == *raised_for_setpcap_p) { -+ fprintf(stderr, "modification requires CAP_SETPCAP\n"); -+ exit(1); -+ } -+ if (cap_set_flag(*raised_for_setpcap_p, CAP_EFFECTIVE, 1, -+ raise_setpcap, CAP_SET) != 0) { -+ perror("unable to select CAP_SETPCAP"); -+ exit(1); -+ } -+} - -- for (i=1; i write a new value for securebits\n" -diff --git a/progs/quicktest.sh b/progs/quicktest.sh -index e8b2c8e..fc7b4cc 100755 ---- a/progs/quicktest.sh -+++ b/progs/quicktest.sh -@@ -46,7 +46,7 @@ pass_capsh --print - - - # Make a local non-setuid-0 version of capsh and call it privileged --cp ./capsh ./privileged && chmod -s ./privileged -+cp ./capsh ./privileged && /bin/chmod -s ./privileged - if [ $? -ne 0 ]; then - echo "Failed to copy capsh for capability manipulation" - exit 1 -@@ -67,11 +67,11 @@ fi - # Explore keep_caps support - pass_capsh --keep=0 --keep=1 --keep=0 --keep=1 --print - --rm -f tcapsh --cp capsh tcapsh --chown root.root tcapsh --chmod u+s tcapsh --ls -l tcapsh -+/bin/rm -f tcapsh -+/bin/cp capsh tcapsh -+/bin/chown root.root tcapsh -+/bin/chmod u+s tcapsh -+/bin/ls -l tcapsh - - # leverage keep caps maintain capabilities accross a change of uid - # from setuid root to capable luser (as per wireshark/dumpcap 0.99.7) -@@ -98,7 +98,7 @@ fail_capsh --secbits=32 --keep=1 --keep=0 --print - pass_capsh --secbits=10 --keep=0 --keep=1 --print - fail_capsh --secbits=47 -- -c "./tcapsh --uid=$nouid" - --rm -f tcapsh -+/bin/rm -f tcapsh - - # Suppress uid=0 privilege - fail_capsh --secbits=47 --print -- -c "./capsh --uid=$nouid" -@@ -117,10 +117,10 @@ fail_capsh --drop=cap_setuid --secbits=0x2f --print -- -c "./privileged --uid=$n - pass_capsh --secbits=47 --inh=cap_setuid,cap_setgid --drop=cap_setuid \ - --uid=500 --print -- -c "./privileged --uid=$nouid" - --rm -f ./privileged -+/bin/rm -f ./privileged - - # test that we do not support capabilities on setuid shell-scripts --cat > hack.sh < hack.sh < hack.sh <&1 | /usr/bin/cut -d: -f2) -+if [ "\$caps" != " = cap_setuid+i" ]; then -+ echo "Shell script got [\$caps]" -+ exit 0 -+fi -+ls -l \$0 -+echo "no capabilities [\$caps] for this shell script" -+exit 1 -+EOF -+/bin/chmod +x hack.sh -+pass_capsh --keep=1 --uid=$nouid --inh=cap_setuid --addamb=cap_setuid -- ./hack.sh -+ -+/bin/rm -f hack.sh --- -2.13.2 - diff --git a/recipes-support/libcap/libcap_2.25.bbappend b/recipes-support/libcap/libcap_2.25.bbappend deleted file mode 100644 index 057404eb5..000000000 --- a/recipes-support/libcap/libcap_2.25.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += "file://0001-Fix-tyop-in-a-comment.patch \ - file://0002-Add-something-to-run-libcap-s-quicktest-tests-agains.patch \ - file://0003-Add-initial-support-for-the-ambient-set.patch \ - file://0004-Clean-up-ambient-support-and-add-a-smoke-test-for-th.patch \ -" diff --git a/recipes-support/opencv/opencv_3.3.bbappend b/recipes-support/opencv/opencv_4.1.0.bbappend similarity index 100% rename from recipes-support/opencv/opencv_3.3.bbappend rename to recipes-support/opencv/opencv_4.1.0.bbappend