From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- ...s-sysmacros.h-for-major-minor-definitions.patch | 26 +++++++++++++++ .../recipes-dvb/oscam/oscam/respect-cflags.patch | 38 ---------------------- .../meta-multimedia/recipes-dvb/oscam/oscam_svn.bb | 8 ++--- 3 files changed, 30 insertions(+), 42 deletions(-) create mode 100644 meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch delete mode 100644 meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch (limited to 'meta-openembedded/meta-multimedia/recipes-dvb/oscam') diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch new file mode 100644 index 000000000..d3d89e333 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch @@ -0,0 +1,26 @@ +From a372fe467495a674ad6244b67e83dfbfa8455f51 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 11 Aug 2018 13:54:32 -0700 +Subject: [PATCH] include sys/sysmacros.h for major/minor definitions + +csctapi/ifd_db2com.c:27: undefined reference to `minor' +collect2: error: ld returned 1 exit status + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + globals.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/globals.h b/globals.h +index bd12244..9e10225 100644 +--- a/globals.h ++++ b/globals.h +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + /* + * The following hack is taken from Linux: include/linux/kconfig.h diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch deleted file mode 100644 index 179d04a55..000000000 --- a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch +++ /dev/null @@ -1,38 +0,0 @@ -Upstream-Status: Backport -http://www.streamboard.tv/oscam/changeset/10068 -http://www.streamboard.tv/oscam/changeset/10070 - -Index: /CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt (revision 10067) -+++ b/CMakeLists.txt (revision 10068) -@@ -625,8 +625,8 @@ - list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) - add_definitions ("-W -Wall ") -- set (CMAKE_C_FLAGS "-Wall -O2") -- set (CMAKE_CXX_FLAGS "-Wall -O2") -- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") -- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") -+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") -+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") - endif (CMAKE_COMPILER_IS_GNUCC) - # some optimisations -Index: /csctapi/CMakeLists.txt -=================================================================== ---- a/csctapi/CMakeLists.txt (revision 10069) -+++ b/csctapi/CMakeLists.txt (revision 10070) -@@ -6,8 +6,8 @@ - list(GET GCC_VERSION_COMPONENTS 0 GCC_MINOR) - add_definitions ("-W -Wall ") -- set (CMAKE_C_FLAGS "-Wall -O2") -- set (CMAKE_CXX_FLAGS "-Wall -O2") -- set (CMAKE_C_FLAGS_DEBUG "-O0 -ggdb") -- set (CMAKE_CXX_FLAGS_DEBUG "-O0 -ggdb") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O2") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O2") -+ set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb") -+ set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -ggdb") - endif (CMAKE_COMPILER_IS_GNUCC) - # Mac extra removes to avoid ranlib warnings in some situations diff --git a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb index cac517ff5..a8aec113c 100644 --- a/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb +++ b/meta-openembedded/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb @@ -4,12 +4,12 @@ HOMEPAGE = "http://www.streamboard.tv/oscam/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "libusb1 openssl pcsc-lite" +DEPENDS = "libusb1 openssl10 pcsc-lite" SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \ - file://respect-cflags.patch \ -" -SRCREV = "9164" + file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \ + " +SRCREV = "11431" PV = "1.10+${SRCPV}" S = "${WORKDIR}/trunk" -- cgit v1.2.3