[meta-webserver][PATCH 01/21] sthttpd: Add dependency on virtual/crypt

[meta-webserver][PATCH 01/21] sthttpd: Add dependency on virtual/crypt

[Khem Raj]

This is required with glibc 2.28+ where crypt is
no longer part of glibc

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
index 81815d6526..8632b97f44 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.27.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://opensource.dyc.edu/sthttpd"
 LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dcbe9eb18815516502872"
 
-DEPENDS += "base-passwd"
+DEPENDS += "base-passwd virtual/crypt"
 
 SRC_URI = "https://github.com/blueness/${BPN}/archive/v${PV}.tar.gz;downloadfilename=${BP}.tar.gz \
            file://thttpd.service \
-- 
2.18.0

[meta-initramfs][PATCH 02/21] kexecboot: Fix build with glibc 2.28+

[Khem Raj]

Update to latest srcrev at the same time.
Fix out of tree builds

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...top_srcdir-to-compiler-include-paths.patch | 27 +++++++++++++++++
 .../files/0002-include-sys-sysmacros.h.patch  | 30 +++++++++++++++++++
 .../recipes-bsp/kexecboot/kexecboot_git.bb    | 10 ++++---
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
 create mode 100644 meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch

diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
new file mode 100644
index 0000000000..0565133d95
--- /dev/null
+++ b/meta-initramfs/recipes-bsp/kexecboot/files/0001-Add-top_srcdir-to-compiler-include-paths.patch
@@ -0,0 +1,27 @@
+From d302547305727797e0172ba89e7519252c400021 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 14:37:22 -0700
+Subject: [PATCH 1/2] Add top_srcdir to compiler include paths
+
+Helps in compiling with out of tree build dir
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index d04a3a8..6449c5a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,5 +1,7 @@
+ bin_PROGRAMS=kexecboot
+ 
++kexecboot_CFLAGS = -I$(top_srcdir)
++
+ kexecboot_SOURCES = \
+ 	util.c \
+ 	cfgparser.c \
+-- 
+2.18.0
+
diff --git a/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch b/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch
new file mode 100644
index 0000000000..f12ae99e72
--- /dev/null
+++ b/meta-initramfs/recipes-bsp/kexecboot/files/0002-include-sys-sysmacros.h.patch
@@ -0,0 +1,30 @@
+From c587012cbe448c9295f50497812ca3530cabbb51 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 14:39:01 -0700
+Subject: [PATCH 2/2] include sys/sysmacros.h
+
+glibc 2.28+ does not include this header implicitly via other system
+headers anymore
+
+src/devicescan.c:373: undefined reference to `makedev'
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/devicescan.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/devicescan.c b/src/devicescan.c
+index 4f2f497..0b2b253 100644
+--- a/src/devicescan.c
++++ b/src/devicescan.c
+@@ -20,6 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+-- 
+2.18.0
+
diff --git a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
index 9f5dad7c64..8799a3e4cc 100644
--- a/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
+++ b/meta-initramfs/recipes-bsp/kexecboot/kexecboot_git.bb
@@ -38,15 +38,17 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 PV = "0.6+git${SRCPV}"
 S = "${WORKDIR}/git"
-SRC_URI = "git://github.com/kexecboot/kexecboot.git"
-SRCREV = "4c4f127e79ac5b8d6b6e2fbb938ccbf12b04c531"
+SRC_URI = "git://github.com/kexecboot/kexecboot.git \
+           file://0001-Add-top_srcdir-to-compiler-include-paths.patch \
+           file://0002-include-sys-sysmacros.h.patch \
+           "
+SRCREV = "d5ffd81bf6a1a2087cdc6c606cae98099229131c"
 inherit autotools
 
 EXTRA_OECONF = "--enable-textui --enable-delay=2 --enable-evdev-rate=1000,250"
 
 do_install () {
-    install -d ${D}${bindir}
-    install -m 0755 kexecboot ${D}${bindir}
+    install -D -m 0755 ${B}/src/kexecboot ${D}${bindir}/kexecboot
     install -d ${D}/proc
     install -d ${D}/mnt
     install -d ${D}/dev
-- 
2.18.0

[meta-multimedia][PATCH 03/21] oscam: Upgrade to latest rev 11431 on trunk

[Khem Raj]

Add patch to fix build with glibc 2.28+
Remove backported patches which are no longer needed

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...macros.h-for-major-minor-definitions.patch | 26 +++++++++++++
 .../oscam/oscam/respect-cflags.patch          | 38 -------------------
 .../recipes-dvb/oscam/oscam_svn.bb            |  6 +--
 3 files changed, 29 insertions(+), 41 deletions(-)
 create mode 100644 meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
 delete mode 100644 meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch

diff --git a/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta-multimedia/recipes-dvb/oscam/oscam/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
new file mode 100644
index 0000000000..d3d89e333b
--- /dev/null
+++ b/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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <termios.h>
+ #include <inttypes.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ /*
+  * The following hack is taken from Linux: include/linux/kconfig.h
diff --git a/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch b/meta-multimedia/recipes-dvb/oscam/oscam/respect-cflags.patch
deleted file mode 100644
index 179d04a559..0000000000
--- a/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-multimedia/recipes-dvb/oscam/oscam_svn.bb b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
index cac517ff5d..2bd970fd5d 100644
--- a/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
+++ b/meta-multimedia/recipes-dvb/oscam/oscam_svn.bb
@@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 DEPENDS = "libusb1 openssl 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"
-- 
2.18.0

[meta-oe][PATCH 04/21] eject: Fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...lude-sys-sysmacros.h-for-major-minor.patch | 27 +++++++++++++++++++
 meta-oe/recipes-support/eject/eject_2.1.5.bb  |  3 ++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch

diff --git a/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch b/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch
new file mode 100644
index 0000000000..055128706c
--- /dev/null
+++ b/meta-oe/recipes-support/eject/eject/0001-eject-Include-sys-sysmacros.h-for-major-minor.patch
@@ -0,0 +1,27 @@
+From 433ffb21119a0f39e882dd3fea4742e64aadcc40 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 09:56:40 -0700
+Subject: [PATCH] eject: Include sys/sysmacros.h for major/minor
+
+Fixes
+arm-bec-linux-gnueabi/gcc/arm-bec-linux-gnueabi/8.2.0/ld: eject.o: in function `GetMajorMinor':
+/usr/src/debug/eject/2.1.5-r1/eject-2.1.5/../../../../../../../workspace/sources/eject/eject.c:866: undefined reference to `major'
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ eject.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/eject.c b/eject.c
+index 47e09fe..b171218 100644
+--- a/eject.c
++++ b/eject.c
+@@ -54,6 +54,7 @@
+ #include <sys/wait.h>
+ #include <sys/mtio.h>
+ #include <sys/mount.h>
++#include <sys/sysmacros.h>
+ 
+ #if defined(__linux__)
+ #include <linux/version.h>
diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index 49a3d74f6f..dec2e7ab4c 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -10,7 +10,8 @@ SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
            file://eject-2.1.1-verbose.patch \
            file://eject-2.1.5-spaces.patch \
            file://eject-timeout.patch \
-"
+           file://0001-eject-Include-sys-sysmacros.h-for-major-minor.patch \
+           "
 
 SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
 SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"
-- 
2.18.0

[meta-xfce][PATCH 05/21] xfce4-diskperf-plugin: Fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...lude-sys-sysmacros.h-for-major-minor.patch | 30 +++++++++++++++++++
 .../diskperf/xfce4-diskperf-plugin_2.6.1.bb   |  3 ++
 2 files changed, 33 insertions(+)
 create mode 100644 meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch

diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch
new file mode 100644
index 0000000000..007d3e5852
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin/0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch
@@ -0,0 +1,30 @@
+From c35a8cb24e8adafb11cbc261de37d97244e55927 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 10:08:27 -0700
+Subject: [PATCH] panel-plugin: Include sys/sysmacros.h for major/minor
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+glibc 2.28+ needs it
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Cc: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ panel-plugin/devperf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
+index 175fd44..cb2e88a 100644
+--- a/panel-plugin/devperf.c
++++ b/panel-plugin/devperf.c
+@@ -34,6 +34,7 @@
+ #include <errno.h>
+ #include <sys/time.h>
+ /* for major() and minor() */
++#include <sys/sysmacros.h>
+ #define _BSD_SOURCE
+ #include <sys/types.h>
+ 
diff --git a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
index 161b2bb2b2..dc7f1fcd9a 100644
--- a/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
+++ b/meta-xfce/recipes-panel-plugins/diskperf/xfce4-diskperf-plugin_2.6.1.bb
@@ -5,5 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d3e627798d6a60bece47aa8b3532e1f1"
 
 inherit xfce-panel-plugin
 
+SRC_URI = "http://archive.xfce.org/src/panel-plugins/${BPN}/${@'${PV}'[0:3]}/${BPN}-${PV}.tar.bz2 \
+           file://0001-panel-plugin-Include-sys-sysmacros.h-for-major-minor.patch \
+           "
 SRC_URI[md5sum] = "63d5f03934c2dbddb3ad7bf7f535cc23"
 SRC_URI[sha256sum] = "212ddc742be3eecb6ad5554e1b1df03d5685cb71f48a558d5f895de37c57e4fa"
-- 
2.18.0

[meta-networking][PATCH 06/21] yp-tools: Add dep on virtual/crypt

[Khem Raj]

needed with glibc 2.28+ where crypt has moved into
independent recipe

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-networking/recipes-support/nis/yp-tools_4.2.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
index 4e27e32d48..bb401666c6 100644
--- a/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
+++ b/meta-networking/recipes-support/nis/yp-tools_4.2.3.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/thkukuk/yp-tools \
 
 S = "${WORKDIR}/git"
 
-DEPENDS = "libtirpc libnsl2"
+DEPENDS = "libtirpc libnsl2 virtual/crypt"
 
 inherit autotools systemd
 SYSTEMD_SERVICE_${PN} = "domainname.service"
-- 
2.18.0

[meta-oe][PATCH 07/21] lsscsi: Upgrade to 0.30

[Khem Raj]

rename folder to match recipe name

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../{lssci/lsscsi_0.28.bb => lsscsi/lsscsi_0.30.bb}         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-bsp/{lssci/lsscsi_0.28.bb => lsscsi/lsscsi_0.30.bb} (63%)

diff --git a/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb
similarity index 63%
rename from meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb
rename to meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb
index 4b8cbaf099..af34cdc483 100644
--- a/meta-oe/recipes-bsp/lssci/lsscsi_0.28.bb
+++ b/meta-oe/recipes-bsp/lsscsi/lsscsi_0.30.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM="file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "http://sg.danny.cz/scsi/${BP}.tgz"
 
-SRC_URI[md5sum] = "4a39e3b09cd422e2cae3edbaf56b3176"
-SRC_URI[sha256sum] = "025d009a1af42bc5b2fca664c44c9ecdfd754356e4a44f5c6aced2420afadd50"
+SRC_URI[md5sum] = "298a700cd50bb4be1382d618f7b038f4"
+SRC_URI[sha256sum] = "619a2187405f02c5f57682f3478bffc75326803cd08839e39d434250c5518b15"
 
 inherit autotools
+
+S = "${WORKDIR}/lsscsi-030r154"
-- 
2.18.0

[meta-webserver][PATCH 08/21] hiawatha: Add missing dep on virtual/crypt

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
index a6926d8f44..d6c449b5db 100644
--- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
+++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_10.7.bb
@@ -2,7 +2,7 @@ SUMMARY = "Lightweight secure web server"
 HOMEPAGE = "http://www.hiawatha-webserver.org"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "libxml2 libxslt"
+DEPENDS = "libxml2 libxslt virtual/crypt"
 
 SECTION = "net"
 
-- 
2.18.0

[meta-filesystems][PATCH 09/21] logfsprogs: Fix build with glibc 2.28

[Khem Raj]

mkfs.c:639: undefined reference to `major'

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...smacros.h-for-major-minor-definition.patch | 24 +++++++++++++++++++
 .../logfsprogs/logfsprogs_git.bb              |  1 +
 2 files changed, 25 insertions(+)
 create mode 100644 meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch

diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch
new file mode 100644
index 0000000000..86bb0b53af
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs/0001-include-sys-sysmacros.h-for-major-minor-definition.patch
@@ -0,0 +1,24 @@
+From 3b02acbb3d5bc93422a6821ce47568633ef4ae5e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 15:09:24 -0700
+Subject: [PATCH] include sys/sysmacros.h for major/minor definition
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ mkfs.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mkfs.c b/mkfs.c
+index e612cbd..b6aa63d 100644
+--- a/mkfs.c
++++ b/mkfs.c
+@@ -21,6 +21,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #define __USE_UNIX98
+ #include <unistd.h>
+ #include <zlib.h>
diff --git a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
index 1b4d97d762..d9864ac3e8 100644
--- a/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
+++ b/meta-filesystems/recipes-filesystems/logfsprogs/logfsprogs_git.bb
@@ -14,6 +14,7 @@ DEPENDS = "zlib"
 SRC_URI = "git://github.com/prasad-joshi/logfsprogs.git \
            file://0001-Add-LDFLAGS-to-linker-cmdline.patch \
            file://0001-btree-Avoid-conflicts-with-libc-namespace-about-setk.patch \
+           file://0001-include-sys-sysmacros.h-for-major-minor-definition.patch \
            "
 SRCREV = "45b72c81ce3c6fa17ca19bafc207ea93e76312f4"
 
-- 
2.18.0

[meta-oe][PATCH 10/21] lockdev: Fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...macros.h-for-major-minor-definitions.patch | 30 +++++++++++++++++++
 .../recipes-support/lockdev/lockdev_git.bb    |  4 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch

diff --git a/meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
new file mode 100644
index 0000000000..12f5be981b
--- /dev/null
+++ b/meta-oe/recipes-support/lockdev/lockdev/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
@@ -0,0 +1,30 @@
+From 2f39dc3d6f920c0826aa74367da1a0a7cc49b0fe Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 15:18:04 -0700
+Subject: [PATCH] include sys/sysmacros.h for major/minor definitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated.
+This means that in a future release, the macros “major”, “minor”, and
+“makedev” will only be available from <sys/sysmacros.h>.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/lockdev.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lockdev.c b/src/lockdev.c
+index 9a0fca5..3581938 100644
+--- a/src/lockdev.c
++++ b/src/lockdev.c
+@@ -117,6 +117,7 @@
+ #include <sys/stat.h>
+ #include <sys/file.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include "lockdev.h"
+ #include "ttylock.h"
diff --git a/meta-oe/recipes-support/lockdev/lockdev_git.bb b/meta-oe/recipes-support/lockdev/lockdev_git.bb
index 507ce3fe57..5ad7f0c503 100644
--- a/meta-oe/recipes-support/lockdev/lockdev_git.bb
+++ b/meta-oe/recipes-support/lockdev/lockdev_git.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM="file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 PV = "1.0.3+git${SRCPV}"
 
 SRCREV = "16b899645d32012cc94cc9232f64d4ddaaf0b795"
-SRC_URI = "git://anonscm.debian.org/lockdev/lockdev.git"
+SRC_URI = "git://anonscm.debian.org/lockdev/lockdev.git \
+           file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
+           "
 
 S = "${WORKDIR}/git"
 
-- 
2.18.0

[meta-webserver][PATCH 11/21] nostromo: Add dep on virtual/crypt

[Khem Raj]

glibc 2.28+ this library is not part of libc package

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
index 16f45ce666..a6b1ff0fc6 100644
--- a/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
+++ b/meta-webserver/recipes-httpd/nostromo/nostromo_1.9.6.bb
@@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "541494ecfeafec58c0876ccc90cc23b06e0144f6f42029af44c7cdb1f4
 
 TARGET_CC_ARCH += "${LDFLAGS}"
 
-DEPENDS = "openssl groff-native base-passwd"
+DEPENDS = "openssl groff-native base-passwd virtual/crypt"
 
 inherit update-rc.d
 
-- 
2.18.0

[meta-oe][PATCH 12/21] atop: Upgrade to 2.3.0

[Khem Raj]

Drop already upstreamed patch
Fix build with glibc 2.28+

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...s-sysmacros.h-for-major-minor-macros.patch | 26 +++++
 .../0001-include-missing-header-files.patch   | 97 -------------------
 .../atop/{atop_2.2.3.bb => atop_2.3.0.bb}     | 28 +++---
 3 files changed, 37 insertions(+), 114 deletions(-)
 create mode 100644 meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch
 delete mode 100644 meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
 rename meta-oe/recipes-support/atop/{atop_2.2.3.bb => atop_2.3.0.bb} (69%)

diff --git a/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch b/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch
new file mode 100644
index 0000000000..5646061971
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/0001-add-sys-sysmacros.h-for-major-minor-macros.patch
@@ -0,0 +1,26 @@
+From 13f3771655f859d5e0332dd65b9c43f572f6359d Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 16:02:06 -0700
+Subject: [PATCH] add sys/sysmacros.h for major/minor macros
+
+photosyst.c:1465:19: error: called object 'major' is not a function or function pointer
+     dmp->major  = major(statbuf.st_rdev);
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ photosyst.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/photosyst.c b/photosyst.c
+index 38828ec..caed352 100644
+--- a/photosyst.c
++++ b/photosyst.c
+@@ -152,6 +152,7 @@
+ static const char rcsid[] = "$Id: photosyst.c,v 1.38 2010/11/19 07:40:40 gerlof Exp $";
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
diff --git a/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch b/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
deleted file mode 100644
index 3708f60ba0..0000000000
--- a/meta-oe/recipes-support/atop/atop/0001-include-missing-header-files.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7b651793269b6b86f12c43c30b751b86def27222 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 18 Mar 2017 17:56:40 -0700
-Subject: [PATCH] include missing header files
-
-fixes build with musl
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- deviate.c     | 1 +
- procdbase.c   | 2 +-
- showgeneric.c | 2 +-
- showlinux.c   | 2 +-
- showprocs.c   | 2 +-
- showsys.c     | 2 +-
- 6 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/deviate.c b/deviate.c
-index 7cf1b49..8e615af 100644
---- a/deviate.c
-+++ b/deviate.c
-@@ -178,6 +178,7 @@ static const char rcsid[] = "$Id: deviate.c,v 1.45 2010/10/23 14:02:03 gerlof Ex
- #include <stdio.h>
- #include <errno.h>
- #include <fcntl.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <limits.h>
- #include <memory.h>
-diff --git a/procdbase.c b/procdbase.c
-index 9cab347..0487d26 100644
---- a/procdbase.c
-+++ b/procdbase.c
-@@ -67,7 +67,7 @@ static const char rcsid[] = "$Id: procdbase.c,v 1.8 2010/04/23 12:19:35 gerlof E
- #include <fcntl.h>
- #include <unistd.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "atop.h"
- #include "photoproc.h"
-diff --git a/showgeneric.c b/showgeneric.c
-index 775afa8..3d5be0e 100644
---- a/showgeneric.c
-+++ b/showgeneric.c
-@@ -268,7 +268,7 @@ static const char rcsid[] = "$Id: showgeneric.c,v 1.71 2010/10/25 19:08:32 gerlo
- #include <errno.h>
- #include <fcntl.h>
- #include <string.h>
--#include <termio.h>
-+#include <termios.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff --git a/showlinux.c b/showlinux.c
-index 6e60754..aba2ee6 100644
---- a/showlinux.c
-+++ b/showlinux.c
-@@ -274,7 +274,7 @@ static const char rcsid[] = "$Id: showlinux.c,v 1.70 2010/10/23 14:04:12 gerlof
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
-+#include <termios.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff --git a/showprocs.c b/showprocs.c
-index 5194524..f0169ad 100644
---- a/showprocs.c
-+++ b/showprocs.c
-@@ -94,7 +94,7 @@ static const char rcsid[] = "$Id: showprocs.c,v 1.15 2011/09/05 11:44:16 gerlof
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
-+#include <termios.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
-diff --git a/showsys.c b/showsys.c
-index 26331be..5a05fe5 100644
---- a/showsys.c
-+++ b/showsys.c
-@@ -80,7 +80,7 @@ static const char rcsid[] = "XXXXXX";
- #include <string.h>
- #include <errno.h>
- #include <fcntl.h>
--#include <termio.h>
-+#include <termios.h>
- #include <unistd.h>
- #include <stdarg.h>
- #include <curses.h>
--- 
-2.12.0
-
diff --git a/meta-oe/recipes-support/atop/atop_2.2.3.bb b/meta-oe/recipes-support/atop/atop_2.3.0.bb
similarity index 69%
rename from meta-oe/recipes-support/atop/atop_2.2.3.bb
rename to meta-oe/recipes-support/atop/atop_2.3.0.bb
index 1ab9e7cf9e..302813c2ea 100644
--- a/meta-oe/recipes-support/atop/atop_2.2.3.bb
+++ b/meta-oe/recipes-support/atop/atop_2.3.0.bb
@@ -15,21 +15,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 
 DEPENDS = "ncurses zlib"
 
-ATOP_VER = "${@'-'.join(d.getVar('PV').rsplit('.', 1))}"
-
-SRC_URI = " \
-    http://www.atoptool.nl/download/${BPN}-${ATOP_VER}.tar.gz \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
-    file://0001-include-missing-header-files.patch \
-    file://remove-bashisms.patch \
-    file://fix-permissions.patch \
-    file://sysvinit-implement-status.patch \
-"
-
-SRC_URI[md5sum] = "034dc1544f2ec4e4d2c739d320dc326d"
-SRC_URI[sha256sum] = "c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d"
-
-S = "${WORKDIR}/${BPN}-${ATOP_VER}"
+SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
+           file://remove-bashisms.patch \
+           file://fix-permissions.patch \
+           file://sysvinit-implement-status.patch \
+           file://0001-add-sys-sysmacros.h-for-major-minor-macros.patch \
+           "
+SRC_URI[md5sum] = "48e1dbef8c7d826e68829a8d5fc920fc"
+SRC_URI[sha256sum] = "73e4725de0bafac8c63b032e8479e2305e3962afbe977ec1abd45f9e104eb264"
 
 do_compile() {
     oe_runmake all
@@ -37,13 +31,13 @@ do_compile() {
 
 do_install() {
     if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-        make DESTDIR=${D} VERS=${ATOP_VER} SYSDPATH=${systemd_system_unitdir} \
+        make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
             PMPATHD=${systemd_unitdir}/system-sleep systemdinstall
         install -d ${D}${sysconfdir}/tmpfiles.d
         install -m 644 ${WORKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
         rm -f ${D}${systemd_system_unitdir}/atopacct.service
     else
-        make DESTDIR=${D} VERS=${ATOP_VER} sysvinstall
+        make DESTDIR=${D} VERS=${PV} sysvinstall
         install -d ${D}${sysconfdir}/default/volatiles
         install -m 644 ${WORKDIR}/volatiles.99_atop ${D}${sysconfdir}/default/volatiles/99_atop
         rm -f ${D}${sysconfdir}/init.d/atopacct
-- 
2.18.0

[meta-gnome][PATCH 13/21] usermode: Fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...lude-sys-sysmacros.h-for-major-minor.patch | 25 +++++++++++++++++++
 .../usermode/usermode_1.112.bb                |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch

diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch
new file mode 100644
index 0000000000..277f6e21b0
--- /dev/null
+++ b/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch
@@ -0,0 +1,25 @@
+From 75539659396b18110d5a52a8a32845254b4d8eca Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 18:25:47 -0700
+Subject: [PATCH] Include sys/sysmacros.h for major/minor
+
+usermount.c:238: undefined reference to `major'
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ usermount.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usermount.c b/usermount.c
+index 4107027..21ef77f 100644
+--- a/usermount.c
++++ b/usermount.c
+@@ -40,6 +40,7 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <errno.h>
+ #include <glob.h>
+ #include <libintl.h>
diff --git a/meta-gnome/recipes-support/usermode/usermode_1.112.bb b/meta-gnome/recipes-support/usermode/usermode_1.112.bb
index 51f81a1fac..82ccf3eda7 100644
--- a/meta-gnome/recipes-support/usermode/usermode_1.112.bb
+++ b/meta-gnome/recipes-support/usermode/usermode_1.112.bb
@@ -17,6 +17,7 @@ SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \
            file://0001-fix-compile-failure-against-musl-C-library.patch \
            file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \
            file://0001-Missing-n-in-translated-string.patch \
+           file://0001-Include-sys-sysmacros.h-for-major-minor.patch \
            "
 SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196"
 SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370"
-- 
2.18.0

[meta-filesystems][PATCH 14/21] f2fs-tools: Upgrade to 1.11.0

[Khem Raj]

Fix build with when S != B

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...srcdir-prefix-to-denote-include-path.patch | 29 +++++++++++++++
 .../0002-Fix-mkfs-out-of-tree-builds.patch    | 37 -------------------
 ...fs-tools_1.8.0.bb => f2fs-tools_1.11.0.bb} |  8 ++--
 3 files changed, 34 insertions(+), 40 deletions(-)
 create mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch
 delete mode 100644 meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
 rename meta-filesystems/recipes-utils/f2fs-tools/{f2fs-tools_1.8.0.bb => f2fs-tools_1.11.0.bb} (63%)

diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch
new file mode 100644
index 0000000000..0a3261b4e7
--- /dev/null
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch
@@ -0,0 +1,29 @@
+From 0fb9d6bc25e903f7831a38468845ea143fb5afd5 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 18:49:03 -0700
+Subject: [PATCH] f2fs-tools: Use srcdir prefix to denote include path
+
+This helps builds when builddir != srcdir
+
+Upstream-Status: Submitted [https://lkml.org/lkml/2018/8/12/1]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ tools/sg_write_buffer/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/sg_write_buffer/Makefile.am b/tools/sg_write_buffer/Makefile.am
+index 922c328..19c438d 100644
+--- a/tools/sg_write_buffer/Makefile.am
++++ b/tools/sg_write_buffer/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Makefile.am
+ 
+ if LINUX
+-AM_CPPFLAGS = -I./include
++AM_CPPFLAGS = -I$(srcdir)/include
+ AM_CFLAGS = -Wall
+ sbin_PROGRAMS = sg_write_buffer
+ sg_write_buffer_SOURCES = sg_write_buffer.c \
+-- 
+2.18.0
+
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
deleted file mode 100644
index 9e561cb111..0000000000
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools/0002-Fix-mkfs-out-of-tree-builds.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0731eefd389e01419f78a115e1363ed0c28cfd3a Mon Sep 17 00:00:00 2001
-From: "Yong, Jonathan" <jonathan.yong@intel.com>
-Date: Thu, 30 Mar 2017 08:03:37 +0000
-Subject: [PATCH] Fix mkfs out of tree builds
-
-Libraries are built in builddir, not srcdir, fix Makefile.am
-accordingly.
-
-Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
-Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
-
-The patch was imported from the f2fs-tools repo
-(git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git)
-commit ID 0731eefd389e01419f78a115e1363ed0c28cfd3a.
-
-Upstream-Status: Accepted, expected to be included in 1.9.0.
-
-Signed-off-by: Yong, Jonathan <jonathan.yong@intel.com>
-
----
- mkfs/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mkfs/Makefile.am b/mkfs/Makefile.am
-index 162a0cf..0ea8b49 100644
---- a/mkfs/Makefile.am
-+++ b/mkfs/Makefile.am
-@@ -10,5 +10,5 @@ lib_LTLIBRARIES = libf2fs_format.la
- libf2fs_format_la_SOURCES = f2fs_format_main.c f2fs_format.c f2fs_format_utils.c
- libf2fs_format_la_CFLAGS = -DWITH_BLKDISCARD
- libf2fs_format_la_CPPFLAGS = -I$(top_srcdir)/include
--libf2fs_format_la_LDFLAGS = -luuid -L$(top_srcdir)/lib -lf2fs \
-+libf2fs_format_la_LDFLAGS = -luuid -L$(top_builddir)/lib -lf2fs \
- 	-version-info $(FMT_CURRENT):$(FMT_REVISION):$(FMT_AGE)
--- 
-2.10.2
-
diff --git a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb
similarity index 63%
rename from meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
rename to meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb
index 691cb6ea0e..2240049d44 100644
--- a/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.8.0.bb
+++ b/meta-filesystems/recipes-utils/f2fs-tools/f2fs-tools_1.11.0.bb
@@ -7,10 +7,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=362b4b2594cd362b874a97718faa51d3"
 # to provide libuuid
 DEPENDS = "util-linux"
 
-SRCREV = "1e7aedf99b85d16f94d1d8ad2fcf846403bb2174"
+# v1.11.0
+SRCREV = "b98fab3666e498c2e27ad9dcda6874c9b683f06b"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git \
-    file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \
-    file://0002-Fix-mkfs-out-of-tree-builds.patch"
+           file://0001-Remove-AC_CHECK_FILE-for-cross-compilation.patch \
+           file://0001-f2fs-tools-Use-srcdir-prefix-to-denote-include-path.patch \
+           "
 S = "${WORKDIR}/git"
 
 inherit pkgconfig autotools
-- 
2.18.0

[meta-oe][PATCH 15/21] udisks: Fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../udisks/0001-include-sys-sysmacros.h.patch | 77 +++++++++++++++++++
 .../recipes-support/udisks/udisks_1.0.5.bb    | 14 ++--
 2 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch

diff --git a/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch b/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch
new file mode 100644
index 0000000000..f140793c5e
--- /dev/null
+++ b/meta-oe/recipes-support/udisks/udisks/0001-include-sys-sysmacros.h.patch
@@ -0,0 +1,77 @@
+From 64f051963d6cdeebd19f9e7f0a7e584a1f7acc60 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 11 Aug 2018 19:12:57 -0700
+Subject: [PATCH] include sys/sysmacros.h
+
+fixes build with glibc 2.28+
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/daemon.c          | 1 +
+ src/device.c          | 1 +
+ src/mount-monitor.c   | 1 +
+ tools/udisks.c        | 1 +
+ tools/umount-udisks.c | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 14e952f..2c61cfb 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -39,6 +39,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+diff --git a/src/device.c b/src/device.c
+index d73f9d6..5911d78 100644
+--- a/src/device.c
++++ b/src/device.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+diff --git a/src/mount-monitor.c b/src/mount-monitor.c
+index 573a69c..ccf3365 100644
+--- a/src/mount-monitor.c
++++ b/src/mount-monitor.c
+@@ -28,6 +28,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <mntent.h>
+ 
+diff --git a/tools/udisks.c b/tools/udisks.c
+index d30159b..f24a30a 100644
+--- a/tools/udisks.c
++++ b/tools/udisks.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
+ #include <fcntl.h>
+diff --git a/tools/umount-udisks.c b/tools/umount-udisks.c
+index 2813fe0..5cf6b4d 100644
+--- a/tools/umount-udisks.c
++++ b/tools/umount-udisks.c
+@@ -29,6 +29,7 @@
+ #include <errno.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <pwd.h>
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
index e33266001e..7cd9992214 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
@@ -11,13 +11,13 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
     dbus-glib-native \
 "
 
-SRC_URI = " \
-    http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
-    file://optional-depends.patch \
-    file://0001-fix-build-with-newer-glibc-versions.patch \
-    file://udisks-1.0.5-fix-service-file.patch \
-    file://0001-Make-udev-rules-directory-configurable.patch \
-"
+SRC_URI = "http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
+           file://optional-depends.patch \
+           file://0001-fix-build-with-newer-glibc-versions.patch \
+           file://udisks-1.0.5-fix-service-file.patch \
+           file://0001-Make-udev-rules-directory-configurable.patch \
+           file://0001-include-sys-sysmacros.h.patch \
+           "
 
 SRC_URI[udisks.md5sum] = "70d48dcfe523a74cd7c7fbbc2847fcdd"
 SRC_URI[udisks.sha256sum] = "f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71"
-- 
2.18.0

[meta-oe][PATCH 16/21] tcsh: Add dep on virtual/crypt

[Khem Raj]

libcrypt is now a separate package starting glibc 2.28+

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb b/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
index b59d88f5de..c171963c2f 100644
--- a/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
+++ b/meta-oe/recipes-shells/tcsh/tcsh_6.20.00.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.tcsh.org/"
 LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://Copyright;md5=575cf2715c3bf894e1f79aec1d4eaaf5"
 SECTION = "base"
-DEPENDS = "ncurses gettext-native"
+DEPENDS = "ncurses virtual/crypt gettext-native"
 SRC_URI = " \
     http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/${BP}.tar.gz \
     file://0001-Enable-system-malloc-on-all-linux.patch \
-- 
2.18.0

[meta-networking][PATCH 17/21] owfs: Add dep on virtual/crypt

[Khem Raj]

libcrypt is independent from glibc now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
index 95faa65b1e..780423f0f0 100644
--- a/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
+++ b/meta-networking/recipes-protocols/radiusclient-ng/radiusclient-ng_0.5.6.bb
@@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3e47566c9271b786693d8a08792dbf41"
 
 inherit autotools-brokensep
 
+DEPENDS += "virtual/crypt"
+
 EXTRA_OECONF += "--disable-static"
 
 do_configure_prepend () {
-- 
2.18.0

[meta-filesystems][PATCH 18/21] owfs: Upgrade to 3.2p2 and fix build with glibc 2.28+

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...01-include-sys-sysmacros.h-for-major.patch | 46 +++++++++++++++++++
 .../owfs/{owfs_2.9p1.bb => owfs_3.2p2.bb}     | 19 ++++----
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch
 rename meta-filesystems/recipes-filesystems/owfs/{owfs_2.9p1.bb => owfs_3.2p2.bb} (84%)

diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch
new file mode 100644
index 0000000000..0a990ac686
--- /dev/null
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs/0001-include-sys-sysmacros.h-for-major.patch
@@ -0,0 +1,46 @@
+From dd1af7541f18399bcdcb129a8b6618c18ebd9d63 Mon Sep 17 00:00:00 2001
+From: Tomasz Torcz <tomek@pipebreaker.pl>
+Date: Sat, 17 Mar 2018 12:56:04 +0100
+Subject: [PATCH] include <sys/sysmacros.h> for major()
+
+  Linux glibc ceased to include it in sys/types.h:
+https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
+
+Upstream-Status: Backport
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac                  | 2 +-
+ module/owlib/src/include/ow.h | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 86751bf7..d625d3f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -180,7 +180,7 @@ m4_include([src/scripts/m4/acx_pthread.m4])
+ # Checks for header files.
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
++AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/sysmacros.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
+ AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h])
+ AC_CHECK_HEADERS(sys/event.h sys/inotify.h)
+ 
+diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h
+index 9dbec5f3..0a310552 100644
+--- a/module/owlib/src/include/ow.h
++++ b/module/owlib/src/include/ow.h
+@@ -188,8 +188,12 @@
+ #include <netdb.h>				/* for getaddrinfo */
+ #endif							/* HAVE_NETDB_H */
+ 
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>			/* for major() */
++#endif							/* HAVE_SYS_SYSMACROS_H */
++
+ #ifdef HAVE_SYS_MKDEV_H
+-#include <sys/mkdev.h>			/* for major() */
++#include <sys/mkdev.h>			/* for major() on Solaris */
+ #endif							/* HAVE_SYS_MKDEV_H */
+ 
+ #include <stddef.h> // for offsetof()
diff --git a/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb
similarity index 84%
rename from meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
rename to meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb
index 21fd7e93e2..50865cccda 100644
--- a/meta-filesystems/recipes-filesystems/owfs/owfs_2.9p1.bb
+++ b/meta-filesystems/recipes-filesystems/owfs/owfs_3.2p2.bb
@@ -4,18 +4,21 @@ HOMEPAGE = "http://www.owfs.org/"
 SECTION = "console/network"
 
 LICENSE = "GPLv2 & LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=a0bc427f423a41220ab79a0b392218bd \
-                    file://COPYING.LIB;md5=865c4bd642d9e04f43925ad7e929ae87"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12a64df1cc87275e940cab05ee75c37d \
+                    file://COPYING.LIB;md5=16ff3ffebed582e19ea7a4f48ec77b42"
 
 DEPENDS = "fuse virtual/libusb0"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \
+# v3.2p2
+SRCREV = "93c1f36d9ac481075287da331d5184f590f8c0fa"
+SRC_URI = "git://github.com/owfs/owfs \
            file://owhttpd \
-           file://owserver "
-SRC_URI[md5sum] = "56ba145be208002e58775a7203369851"
-SRC_URI[sha256sum] = "9d22dbff72d235476688c02669f7171b23e21dffadf40bbdd3b8263908218424"
+           file://owserver \
+           file://0001-include-sys-sysmacros.h-for-major.patch \
+           "
+
+S = "${WORKDIR}/git"
 
-inherit autotools-brokensep update-rc.d
+inherit autotools-brokensep update-rc.d pkgconfig
 
 EXTRA_OECONF = " \
                  --with-fuseinclude=${STAGING_INCDIR} \
-- 
2.18.0

[meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
 .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
 .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
 ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
 4 files changed, 24 insertions(+), 38 deletions(-)
 rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.10.2.bb => cfengine-masterfiles_3.12.0.bb} (87%)
 delete mode 100644 meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
 rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb => cfengine_3.12.0.bb} (93%)

diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
similarity index 87%
rename from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
index b52e7cc082..dda6af9c9d 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
@@ -22,8 +22,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
-SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
+SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
+SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
 
 inherit autotools
 
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
deleted file mode 100644
index 2295e415cd..0000000000
--- a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-projlibdir use a hard coded lib path, this will cause error when build a 64bit
-target. So change it to suitable path.
-
-Signed-off-by: Song.Li <Song.Li@windriver.com>
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
-Signed-off-by: Kai Kang <kai.kang@windriver.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 38e2b9c..bc6b996 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
-   fi
- 
-   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_?
--  projlibdir='${exec_prefix}/lib'
-+  projlibdir='${libdir}'
-   mandir='${exec_prefix}/share/man'
- ])
- 
--- 
-1.7.1
-
diff --git a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
index b9526f2843..db69f951ca 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
+++ b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
@@ -1,23 +1,38 @@
+From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Mon, 18 Jul 2016 09:06:06 +0800
+Subject: [PATCH] cfengine: add recipe and base policy
+
 Upstream-Status: Inappropriate [configuration]
 
 Set the path of default configure file.
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
+ misc/init.d/cfengine3.in | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
 diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
-index d6ae26f..1dee283 100644
+index c584817..12f5803 100644
 --- a/misc/init.d/cfengine3.in
 +++ b/misc/init.d/cfengine3.in
-@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
+@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
  fi
  
  # default control file
 -if [ "$DEBIAN" = "1" ]; then
 -    DEFAULT=/etc/default/cfengine3
+-    INIT_FUNCTIONS=/lib/lsb/init-functions
+-    if [ -e "$INIT_FUNCTIONS" ]; then
+-        . "$INIT_FUNCTIONS"
+-    fi
 -else
 -    DEFAULT=/etc/sysconfig/cfengine3
--fi
 +DEFAULT=/etc/default/cfengine3
++INIT_FUNCTIONS=/lib/lsb/init-functions
++if [ -e "$INIT_FUNCTIONS" ]; then
++    . "$INIT_FUNCTIONS"
+ fi
  
  if [ -f $DEFAULT ]; then
-     . $DEFAULT
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
similarity index 93%
rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
index b86b0a1f18..aa33a97a4d 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
@@ -16,12 +16,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494"
 DEPENDS = "attr tokyocabinet"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
-           file://change-hard-coded-lib-path.patch \
            file://set-path-of-default-config-file.patch \
-"
+           "
 
-SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
-SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
+SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
+SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
 
 inherit autotools systemd
 
-- 
2.18.0

[meta-webserver][PATCH 20/21] nginx: Upgrade to 1.15.2

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb | 6 ------
 meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb
 create mode 100644 meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb

diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb
deleted file mode 100644
index de229605ee..0000000000
--- a/meta-webserver/recipes-httpd/nginx/nginx_1.14.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require nginx.inc
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe"
-
-SRC_URI[md5sum] = "2d856aca3dfe1d32e3c9f8c4cac0cc95"
-SRC_URI[sha256sum] = "5d15becbf69aba1fe33f8d416d97edd95ea8919ea9ac519eff9bafebb6022cb5"
diff --git a/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb b/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb
new file mode 100644
index 0000000000..3694f5b586
--- /dev/null
+++ b/meta-webserver/recipes-httpd/nginx/nginx_1.15.2.bb
@@ -0,0 +1,6 @@
+require nginx.inc
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3691402cc54ce09f800ca348634a2dfe"
+
+SRC_URI[md5sum] = "d063f746d3dc4298aed9c518f1684166"
+SRC_URI[sha256sum] = "eeba09aecfbe8277ac33a5a2486ec2d6731739f3c1c701b42a0c3784af67ad90"
-- 
2.18.0

[meta-oe][PATCH 21/21] stress-ng: Upgrade to 0.09.36

[Khem Raj]

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...01-Several-changes-to-fix-musl-build.patch |  2 +-
 ...0002-stress-fcntl-fix-build-for-musl.patch | 25 -------------------
 ...ess-ng_0.09.14.bb => stress-ng_0.09.36.bb} |  7 +++---
 3 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
 rename meta-oe/recipes-test/stress-ng/{stress-ng_0.09.14.bb => stress-ng_0.09.36.bb} (76%)

diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
index d604f860a1..93d9b544d5 100644
--- a/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
+++ b/meta-oe/recipes-test/stress-ng/stress-ng/0001-Several-changes-to-fix-musl-build.patch
@@ -1,4 +1,4 @@
-From 784dcd09d3f266e271d007f4fd257e85036872ca Mon Sep 17 00:00:00 2001
+From d499375fe267be8819ecb985123d89a21edc0e59 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
 Date: Tue, 17 Oct 2017 10:13:20 -0500
 Subject: [PATCH] Several changes to fix musl build
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch b/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
deleted file mode 100644
index ed3287e329..0000000000
--- a/meta-oe/recipes-test/stress-ng/stress-ng/0002-stress-fcntl-fix-build-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From faadbc147394cea9278bc2494f33e3521d88e742 Mon Sep 17 00:00:00 2001
-From: Tim Orling <timothy.t.orling@linux.intel.com>
-Date: Tue, 9 Jan 2018 18:38:45 -0800
-Subject: [PATCH] stress-fcntl: fix build for musl
-
-Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
-
-Upstream-status: Pending
-
----
- stress-fcntl.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/stress-fcntl.c b/stress-fcntl.c
-index 2ea867b..e91b345 100644
---- a/stress-fcntl.c
-+++ b/stress-fcntl.c
-@@ -415,6 +415,7 @@ ofd_lock_abort:	{ /* Nowt */ }
- #if (defined(F_GET_FILE_RW_HINT) && defined(F_SET_FILE_RW_HINT)) | \
-     (defined(F_GET_RW_HINT) && defined(F_SET_RW_HINT))
- 	{
-+		int ret;
- 		size_t i;
- 		unsigned long hint;
- 		static const unsigned long hints[] = {
diff --git a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.36.bb
similarity index 76%
rename from meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
rename to meta-oe/recipes-test/stress-ng/stress-ng_0.09.36.bb
index 7fab43025f..9d1f316477 100644
--- a/meta-oe/recipes-test/stress-ng/stress-ng_0.09.14.bb
+++ b/meta-oe/recipes-test/stress-ng/stress-ng_0.09.36.bb
@@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 DEPENDS = "zlib libaio"
 
 SRC_URI = "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/${BP}.tar.xz \
-           file://0002-stress-fcntl-fix-build-for-musl.patch \
-          "
+           "
 SRC_URI_append_libc-musl = " \
     file://0001-Several-changes-to-fix-musl-build.patch \
     "
-SRC_URI[md5sum] = "1f8b6c2c2830704d2a2814c16082d48e"
-SRC_URI[sha256sum] = "02cac34a5cb041197af60c1867844c6cbb089a6d10a38cdcf7b8f27bfaa6ef8f"
+SRC_URI[md5sum] = "7907e858f560870926e31dfa92f887b7"
+SRC_URI[sha256sum] = "16102abee20fe26b1a8784ab05c61b3e72474503bc50b9debc9f457cb4b4e228"
 
 UPSTREAM_CHECK_URI ?= "http://kernel.ubuntu.com/~cking/tarballs/${BPN}/"
 UPSTREAM_CHECK_REGEX ?= "(?P<pver>\d+(\.\d+)+)\.tar"
-- 
2.18.0

Re: [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

[Martin Jansa]

With this one I'm seeing cfengine-3.12.0-r0 do_package failure:

ERROR: SYSTEMD_SERVICE_cfengine value cf-consumer.service does not exist

On Mon, Aug 13, 2018 at 10:20 AM Khem Raj <raj.khem@gmail.com> wrote:

> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
>  ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
>  .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
>  .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
>  ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
>  4 files changed, 24 insertions(+), 38 deletions(-)
>  rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.10.2.bb
> => cfengine-masterfiles_3.12.0.bb} (87%)
>  delete mode 100644
> meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>  rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb =>
> cfengine_3.12.0.bb} (93%)
>
> diff --git a/meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.12.0.bb
> similarity index 87%
> rename from meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.10.2.bb
> rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
> index b52e7cc082..dda6af9c9d 100644
> --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
> +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
> @@ -22,8 +22,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
>
>  SRC_URI = "
> https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
>
> -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
> -SRC_URI[sha256sum] =
> "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
> +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
> +SRC_URI[sha256sum] =
> "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
>
>  inherit autotools
>
> diff --git
> a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> deleted file mode 100644
> index 2295e415cd..0000000000
> ---
> a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -Upstream-Status: Inappropriate [configuration]
> -
> -projlibdir use a hard coded lib path, this will cause error when build a
> 64bit
> -target. So change it to suitable path.
> -
> -Signed-off-by: Song.Li <Song.Li@windriver.com>
> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ----
> - configure.ac | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index 38e2b9c..bc6b996 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
> -   fi
> -
> -   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_?
> --  projlibdir='${exec_prefix}/lib'
> -+  projlibdir='${libdir}'
> -   mandir='${exec_prefix}/share/man'
> - ])
> -
> ---
> -1.7.1
> -
> diff --git
> a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> index b9526f2843..db69f951ca 100644
> ---
> a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> +++
> b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> @@ -1,23 +1,38 @@
> +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
> +From: Kai Kang <kai.kang@windriver.com>
> +Date: Mon, 18 Jul 2016 09:06:06 +0800
> +Subject: [PATCH] cfengine: add recipe and base policy
> +
>  Upstream-Status: Inappropriate [configuration]
>
>  Set the path of default configure file.
>
>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
> +
>  ---
> + misc/init.d/cfengine3.in | 12 ++++--------
> + 1 file changed, 4 insertions(+), 8 deletions(-)
> +
>  diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
> -index d6ae26f..1dee283 100644
> +index c584817..12f5803 100644
>  --- a/misc/init.d/cfengine3.in
>  +++ b/misc/init.d/cfengine3.in
> -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
> +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
>   fi
>
>   # default control file
>  -if [ "$DEBIAN" = "1" ]; then
>  -    DEFAULT=/etc/default/cfengine3
> +-    INIT_FUNCTIONS=/lib/lsb/init-functions
> +-    if [ -e "$INIT_FUNCTIONS" ]; then
> +-        . "$INIT_FUNCTIONS"
> +-    fi
>  -else
>  -    DEFAULT=/etc/sysconfig/cfengine3
> --fi
>  +DEFAULT=/etc/default/cfengine3
> ++INIT_FUNCTIONS=/lib/lsb/init-functions
> ++if [ -e "$INIT_FUNCTIONS" ]; then
> ++    . "$INIT_FUNCTIONS"
> + fi
>
>   if [ -f $DEFAULT ]; then
> -     . $DEFAULT
> diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> similarity index 93%
> rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> index b86b0a1f18..aa33a97a4d 100644
> --- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> @@ -16,12 +16,11 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494"
>  DEPENDS = "attr tokyocabinet"
>
>  SRC_URI = "
> https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
> -           file://change-hard-coded-lib-path.patch \
>             file://set-path-of-default-config-file.patch \
> -"
> +           "
>
> -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
> -SRC_URI[sha256sum] =
> "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
> +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
> +SRC_URI[sha256sum] =
> "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
>
>  inherit autotools systemd
>
> --
> 2.18.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

[Khem Raj]

On Thu, Aug 16, 2018 at 10:27 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> With this one I'm seeing cfengine-3.12.0-r0 do_package failure:
>
> ERROR: SYSTEMD_SERVICE_cfengine value cf-consumer.service does not exist

its likely, since my local builders use sysvinit and OE builders
where I relied for systemd builds are currently enjoying a cruise in pacific

care to cook a patch ? if not I will get to it eventually.

>
> On Mon, Aug 13, 2018 at 10:20 AM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> ---
>>  ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
>>  .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
>>  .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
>>  ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
>>  4 files changed, 24 insertions(+), 38 deletions(-)
>>  rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.10.2.bb => cfengine-masterfiles_3.12.0.bb} (87%)
>>  delete mode 100644 meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>>  rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb => cfengine_3.12.0.bb} (93%)
>>
>> diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> similarity index 87%
>> rename from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
>> rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> index b52e7cc082..dda6af9c9d 100644
>> --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
>> +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> @@ -22,8 +22,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
>>
>>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
>>
>> -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
>> -SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
>> +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
>> +SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
>>
>>  inherit autotools
>>
>> diff --git a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> deleted file mode 100644
>> index 2295e415cd..0000000000
>> --- a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> +++ /dev/null
>> @@ -1,28 +0,0 @@
>> -Upstream-Status: Inappropriate [configuration]
>> -
>> -projlibdir use a hard coded lib path, this will cause error when build a 64bit
>> -target. So change it to suitable path.
>> -
>> -Signed-off-by: Song.Li <Song.Li@windriver.com>
>> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ----
>> - configure.ac | 2 +-
>> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> -
>> -diff --git a/configure.ac b/configure.ac
>> -index 38e2b9c..bc6b996 100644
>> ---- a/configure.ac
>> -+++ b/configure.ac
>> -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
>> -   fi
>> -
>> -   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_?
>> --  projlibdir='${exec_prefix}/lib'
>> -+  projlibdir='${libdir}'
>> -   mandir='${exec_prefix}/share/man'
>> - ])
>> -
>> ---
>> -1.7.1
>> -
>> diff --git a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> index b9526f2843..db69f951ca 100644
>> --- a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> +++ b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> @@ -1,23 +1,38 @@
>> +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
>> +From: Kai Kang <kai.kang@windriver.com>
>> +Date: Mon, 18 Jul 2016 09:06:06 +0800
>> +Subject: [PATCH] cfengine: add recipe and base policy
>> +
>>  Upstream-Status: Inappropriate [configuration]
>>
>>  Set the path of default configure file.
>>
>>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> +
>>  ---
>> + misc/init.d/cfengine3.in | 12 ++++--------
>> + 1 file changed, 4 insertions(+), 8 deletions(-)
>> +
>>  diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
>> -index d6ae26f..1dee283 100644
>> +index c584817..12f5803 100644
>>  --- a/misc/init.d/cfengine3.in
>>  +++ b/misc/init.d/cfengine3.in
>> -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
>> +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
>>   fi
>>
>>   # default control file
>>  -if [ "$DEBIAN" = "1" ]; then
>>  -    DEFAULT=/etc/default/cfengine3
>> +-    INIT_FUNCTIONS=/lib/lsb/init-functions
>> +-    if [ -e "$INIT_FUNCTIONS" ]; then
>> +-        . "$INIT_FUNCTIONS"
>> +-    fi
>>  -else
>>  -    DEFAULT=/etc/sysconfig/cfengine3
>> --fi
>>  +DEFAULT=/etc/default/cfengine3
>> ++INIT_FUNCTIONS=/lib/lsb/init-functions
>> ++if [ -e "$INIT_FUNCTIONS" ]; then
>> ++    . "$INIT_FUNCTIONS"
>> + fi
>>
>>   if [ -f $DEFAULT ]; then
>> -     . $DEFAULT
>> diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> similarity index 93%
>> rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
>> rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> index b86b0a1f18..aa33a97a4d 100644
>> --- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
>> +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> @@ -16,12 +16,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494"
>>  DEPENDS = "attr tokyocabinet"
>>
>>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
>> -           file://change-hard-coded-lib-path.patch \
>>             file://set-path-of-default-config-file.patch \
>> -"
>> +           "
>>
>> -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
>> -SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
>> +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
>> +SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
>>
>>  inherit autotools systemd
>>
>> --
>> 2.18.0
>>
>> --
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Re: [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

[Martin Jansa]

I'll check that.

I'm also seeing failures in netkit-rsh uw-imap inetutils pure-ftpd all
related to crypt(), I'll check if it's just a dependency and then a bit
strange error in kernel-selftest

sed: can't read
kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf/Makefile:
No such file or directory

Which might be because older kernel used in this build.


On Thu, Aug 16, 2018 at 7:58 PM Khem Raj <raj.khem@gmail.com> wrote:

> On Thu, Aug 16, 2018 at 10:27 AM Martin Jansa <martin.jansa@gmail.com>
> wrote:
> >
> > With this one I'm seeing cfengine-3.12.0-r0 do_package failure:
> >
> > ERROR: SYSTEMD_SERVICE_cfengine value cf-consumer.service does not exist
>
> its likely, since my local builders use sysvinit and OE builders
> where I relied for systemd builds are currently enjoying a cruise in
> pacific
>
> care to cook a patch ? if not I will get to it eventually.
>
> >
> > On Mon, Aug 13, 2018 at 10:20 AM Khem Raj <raj.khem@gmail.com> wrote:
> >>
> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> >> ---
> >>  ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
> >>  .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
> >>  .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
> >>  ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
> >>  4 files changed, 24 insertions(+), 38 deletions(-)
> >>  rename meta-oe/recipes-extended/cfengine/{
> cfengine-masterfiles_3.10.2.bb => cfengine-masterfiles_3.12.0.bb} (87%)
> >>  delete mode 100644
> meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> >>  rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb =>
> cfengine_3.12.0.bb} (93%)
> >>
> >> diff --git a/meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.12.0.bb
> >> similarity index 87%
> >> rename from meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.10.2.bb
> >> rename to meta-oe/recipes-extended/cfengine/
> cfengine-masterfiles_3.12.0.bb
> >> index b52e7cc082..dda6af9c9d 100644
> >> --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
> >> +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
> >> @@ -22,8 +22,8 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
> >>
> >>  SRC_URI = "
> https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
> >>
> >> -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
> >> -SRC_URI[sha256sum] =
> "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
> >> +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
> >> +SRC_URI[sha256sum] =
> "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
> >>
> >>  inherit autotools
> >>
> >> diff --git
> a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> >> deleted file mode 100644
> >> index 2295e415cd..0000000000
> >> ---
> a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
> >> +++ /dev/null
> >> @@ -1,28 +0,0 @@
> >> -Upstream-Status: Inappropriate [configuration]
> >> -
> >> -projlibdir use a hard coded lib path, this will cause error when build
> a 64bit
> >> -target. So change it to suitable path.
> >> -
> >> -Signed-off-by: Song.Li <Song.Li@windriver.com>
> >> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> >> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
> >> ----
> >> - configure.ac | 2 +-
> >> - 1 file changed, 1 insertion(+), 1 deletion(-)
> >> -
> >> -diff --git a/configure.ac b/configure.ac
> >> -index 38e2b9c..bc6b996 100644
> >> ---- a/configure.ac
> >> -+++ b/configure.ac
> >> -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
> >> -   fi
> >> -
> >> -   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being
> sbin_?
> >> --  projlibdir='${exec_prefix}/lib'
> >> -+  projlibdir='${libdir}'
> >> -   mandir='${exec_prefix}/share/man'
> >> - ])
> >> -
> >> ---
> >> -1.7.1
> >> -
> >> diff --git
> a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> >> index b9526f2843..db69f951ca 100644
> >> ---
> a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> >> +++
> b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
> >> @@ -1,23 +1,38 @@
> >> +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
> >> +From: Kai Kang <kai.kang@windriver.com>
> >> +Date: Mon, 18 Jul 2016 09:06:06 +0800
> >> +Subject: [PATCH] cfengine: add recipe and base policy
> >> +
> >>  Upstream-Status: Inappropriate [configuration]
> >>
> >>  Set the path of default configure file.
> >>
> >>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
> >> +
> >>  ---
> >> + misc/init.d/cfengine3.in | 12 ++++--------
> >> + 1 file changed, 4 insertions(+), 8 deletions(-)
> >> +
> >>  diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
> >> -index d6ae26f..1dee283 100644
> >> +index c584817..12f5803 100644
> >>  --- a/misc/init.d/cfengine3.in
> >>  +++ b/misc/init.d/cfengine3.in
> >> -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
> >> +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
> >>   fi
> >>
> >>   # default control file
> >>  -if [ "$DEBIAN" = "1" ]; then
> >>  -    DEFAULT=/etc/default/cfengine3
> >> +-    INIT_FUNCTIONS=/lib/lsb/init-functions
> >> +-    if [ -e "$INIT_FUNCTIONS" ]; then
> >> +-        . "$INIT_FUNCTIONS"
> >> +-    fi
> >>  -else
> >>  -    DEFAULT=/etc/sysconfig/cfengine3
> >> --fi
> >>  +DEFAULT=/etc/default/cfengine3
> >> ++INIT_FUNCTIONS=/lib/lsb/init-functions
> >> ++if [ -e "$INIT_FUNCTIONS" ]; then
> >> ++    . "$INIT_FUNCTIONS"
> >> + fi
> >>
> >>   if [ -f $DEFAULT ]; then
> >> -     . $DEFAULT
> >> diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> >> similarity index 93%
> >> rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> >> rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> >> index b86b0a1f18..aa33a97a4d 100644
> >> --- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
> >> +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
> >> @@ -16,12 +16,11 @@ LIC_FILES_CHKSUM =
> "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494"
> >>  DEPENDS = "attr tokyocabinet"
> >>
> >>  SRC_URI = "
> https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
> >> -           file://change-hard-coded-lib-path.patch \
> >>             file://set-path-of-default-config-file.patch \
> >> -"
> >> +           "
> >>
> >> -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
> >> -SRC_URI[sha256sum] =
> "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
> >> +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
> >> +SRC_URI[sha256sum] =
> "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
> >>
> >>  inherit autotools systemd
> >>
> >> --
> >> 2.18.0
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-devel mailing list
> >> Openembedded-devel@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-oe][PATCH 19/21] cfengine, cfengine-masterfiles: Upgrade to 3.12.0

[Khem Raj]

On Thu, Aug 16, 2018 at 11:14 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>
> I'll check that.
>
> I'm also seeing failures in netkit-rsh uw-imap inetutils pure-ftpd all related to crypt(), I'll check if it's just a dependency and then a bit strange error in kernel-selftest

mostly should be dependency, but I wonder why I dont see it in my
world builds for rpi

>
> sed: can't read kernel-selftest/1.0-r0/kernel-selftest-1.0/tools/testing/selftests/bpf/Makefile: No such file or directory
>
> Which might be because older kernel used in this build.
>

selftest package is misbehaving send a revert

>
> On Thu, Aug 16, 2018 at 7:58 PM Khem Raj <raj.khem@gmail.com> wrote:
>>
>> On Thu, Aug 16, 2018 at 10:27 AM Martin Jansa <martin.jansa@gmail.com> wrote:
>> >
>> > With this one I'm seeing cfengine-3.12.0-r0 do_package failure:
>> >
>> > ERROR: SYSTEMD_SERVICE_cfengine value cf-consumer.service does not exist
>>
>> its likely, since my local builders use sysvinit and OE builders
>> where I relied for systemd builds are currently enjoying a cruise in pacific
>>
>> care to cook a patch ? if not I will get to it eventually.
>>
>> >
>> > On Mon, Aug 13, 2018 at 10:20 AM Khem Raj <raj.khem@gmail.com> wrote:
>> >>
>> >> Signed-off-by: Khem Raj <raj.khem@gmail.com>
>> >> ---
>> >>  ...10.2.bb => cfengine-masterfiles_3.12.0.bb} |  4 +--
>> >>  .../cfengine/change-hard-coded-lib-path.patch | 28 -------------------
>> >>  .../set-path-of-default-config-file.patch     | 23 ++++++++++++---
>> >>  ...{cfengine_3.10.2.bb => cfengine_3.12.0.bb} |  7 ++---
>> >>  4 files changed, 24 insertions(+), 38 deletions(-)
>> >>  rename meta-oe/recipes-extended/cfengine/{cfengine-masterfiles_3.10.2.bb => cfengine-masterfiles_3.12.0.bb} (87%)
>> >>  delete mode 100644 meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> >>  rename meta-oe/recipes-extended/cfengine/{cfengine_3.10.2.bb => cfengine_3.12.0.bb} (93%)
>> >>
>> >> diff --git a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> >> similarity index 87%
>> >> rename from meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
>> >> rename to meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> >> index b52e7cc082..dda6af9c9d 100644
>> >> --- a/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.10.2.bb
>> >> +++ b/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.12.0.bb
>> >> @@ -22,8 +22,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
>> >>
>> >>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz"
>> >>
>> >> -SRC_URI[md5sum] = "1247ef4e8f3cee5efa98da50c326e5a4"
>> >> -SRC_URI[sha256sum] = "5d18a8d71f451d0b5dd1f5e579452b29b99b664f2bb0827dbba9a615f2764df6"
>> >> +SRC_URI[md5sum] = "d59bd8c95620da816c382f749d425860"
>> >> +SRC_URI[sha256sum] = "1c50e3d8c702097e13a21258626d936d6ff2e6492e893dfe286ff0d6204d7a65"
>> >>
>> >>  inherit autotools
>> >>
>> >> diff --git a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch b/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> >> deleted file mode 100644
>> >> index 2295e415cd..0000000000
>> >> --- a/meta-oe/recipes-extended/cfengine/cfengine/change-hard-coded-lib-path.patch
>> >> +++ /dev/null
>> >> @@ -1,28 +0,0 @@
>> >> -Upstream-Status: Inappropriate [configuration]
>> >> -
>> >> -projlibdir use a hard coded lib path, this will cause error when build a 64bit
>> >> -target. So change it to suitable path.
>> >> -
>> >> -Signed-off-by: Song.Li <Song.Li@windriver.com>
>> >> -Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
>> >> -Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> >> ----
>> >> - configure.ac | 2 +-
>> >> - 1 file changed, 1 insertion(+), 1 deletion(-)
>> >> -
>> >> -diff --git a/configure.ac b/configure.ac
>> >> -index 38e2b9c..bc6b996 100644
>> >> ---- a/configure.ac
>> >> -+++ b/configure.ac
>> >> -@@ -188,7 +188,7 @@ AS_IF([test x"$enable_fhs" = xyes], [
>> >> -   fi
>> >> -
>> >> -   sbindir='${exec_prefix}/bin' # /var/cfengine/bin despite being sbin_?
>> >> --  projlibdir='${exec_prefix}/lib'
>> >> -+  projlibdir='${libdir}'
>> >> -   mandir='${exec_prefix}/share/man'
>> >> - ])
>> >> -
>> >> ---
>> >> -1.7.1
>> >> -
>> >> diff --git a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> >> index b9526f2843..db69f951ca 100644
>> >> --- a/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> >> +++ b/meta-oe/recipes-extended/cfengine/cfengine/set-path-of-default-config-file.patch
>> >> @@ -1,23 +1,38 @@
>> >> +From dc270040cb3beb5ca42f864813145c8a68594bad Mon Sep 17 00:00:00 2001
>> >> +From: Kai Kang <kai.kang@windriver.com>
>> >> +Date: Mon, 18 Jul 2016 09:06:06 +0800
>> >> +Subject: [PATCH] cfengine: add recipe and base policy
>> >> +
>> >>  Upstream-Status: Inappropriate [configuration]
>> >>
>> >>  Set the path of default configure file.
>> >>
>> >>  Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> >> +
>> >>  ---
>> >> + misc/init.d/cfengine3.in | 12 ++++--------
>> >> + 1 file changed, 4 insertions(+), 8 deletions(-)
>> >> +
>> >>  diff --git a/misc/init.d/cfengine3.in b/misc/init.d/cfengine3.in
>> >> -index d6ae26f..1dee283 100644
>> >> +index c584817..12f5803 100644
>> >>  --- a/misc/init.d/cfengine3.in
>> >>  +++ b/misc/init.d/cfengine3.in
>> >> -@@ -101,11 +101,7 @@ if [ -z "$LOCKDIR" ]; then
>> >> +@@ -101,14 +101,10 @@ if [ -z "$LOCKDIR" ]; then
>> >>   fi
>> >>
>> >>   # default control file
>> >>  -if [ "$DEBIAN" = "1" ]; then
>> >>  -    DEFAULT=/etc/default/cfengine3
>> >> +-    INIT_FUNCTIONS=/lib/lsb/init-functions
>> >> +-    if [ -e "$INIT_FUNCTIONS" ]; then
>> >> +-        . "$INIT_FUNCTIONS"
>> >> +-    fi
>> >>  -else
>> >>  -    DEFAULT=/etc/sysconfig/cfengine3
>> >> --fi
>> >>  +DEFAULT=/etc/default/cfengine3
>> >> ++INIT_FUNCTIONS=/lib/lsb/init-functions
>> >> ++if [ -e "$INIT_FUNCTIONS" ]; then
>> >> ++    . "$INIT_FUNCTIONS"
>> >> + fi
>> >>
>> >>   if [ -f $DEFAULT ]; then
>> >> -     . $DEFAULT
>> >> diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> >> similarity index 93%
>> >> rename from meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
>> >> rename to meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> >> index b86b0a1f18..aa33a97a4d 100644
>> >> --- a/meta-oe/recipes-extended/cfengine/cfengine_3.10.2.bb
>> >> +++ b/meta-oe/recipes-extended/cfengine/cfengine_3.12.0.bb
>> >> @@ -16,12 +16,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f8b34828ab373d6b1bb4b0fc60a78494"
>> >>  DEPENDS = "attr tokyocabinet"
>> >>
>> >>  SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
>> >> -           file://change-hard-coded-lib-path.patch \
>> >>             file://set-path-of-default-config-file.patch \
>> >> -"
>> >> +           "
>> >>
>> >> -SRC_URI[md5sum] = "c16baf08189a1af6fcf2e2ff61102992"
>> >> -SRC_URI[sha256sum] = "d4fa9ac7276dba7b85d6757aab2f0929ab8d3b115cb0e7b0cf984760347429d7"
>> >> +SRC_URI[md5sum] = "33ef12260db4b430352229f37f7cb0e5"
>> >> +SRC_URI[sha256sum] = "d71ba98a272390c6fa8bc20e8ea27f0050a0a72a3e6b206a4762b4646be332ec"
>> >>
>> >>  inherit autotools systemd
>> >>
>> >> --
>> >> 2.18.0
>> >>
>> >> --
>> >> _______________________________________________
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel