From 18428e1d52a560892288366e00183127db9d3633 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 27 Jan 2016 14:05:17 +0100 Subject: [PATCH 1/8] ntp: Deal with /usr/libexec being empty in Yocto master libexecdir is now a dedicated directory and empty in our ntpd build. Avoid QA issue of an empty directory not belonging to anyone. Clean it if it is empty --- recipes-bsp/ntp/ntp_4.2.8p1.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-bsp/ntp/ntp_4.2.8p1.bb b/recipes-bsp/ntp/ntp_4.2.8p1.bb index be5f6d9817..e20b08ee0b 100644 --- a/recipes-bsp/ntp/ntp_4.2.8p1.bb +++ b/recipes-bsp/ntp/ntp_4.2.8p1.bb @@ -101,6 +101,10 @@ do_install_append() { install -d ${D}${systemd_unitdir}/ntp-units.d install -m 0644 ${WORKDIR}/ntpd.list ${D}${systemd_unitdir}/ntp-units.d/60-ntpd.list + + if [ `ls -A ${D}${libexecdir} | wc -l` -eq 0 ]; then + rm -rf ${D}${libexecdir} + fi } PACKAGES += "ntpdate sntp ${PN}-tickadj ${PN}-utils ${PN}-perl" From 4ca7a67cca2b51b3e7216b0c70524633efe681f3 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Feb 2016 23:12:38 +0100 Subject: [PATCH 2/8] iproute2: Remove poky master patches for version 4.4 Yocto is now using iproute2 4.4 and the tools we packaged into the main package are now available as extra packages and we can just drop our extension for master. --- .../iproute2-4.3.0/disable_arpd_in_misc.patch | 17 ----------------- yocto-master/iproute2_%.bbappend | 1 - 2 files changed, 18 deletions(-) delete mode 100644 recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch delete mode 100644 yocto-master/iproute2_%.bbappend diff --git a/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch b/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch deleted file mode 100644 index 8f2ea781a9..0000000000 --- a/recipes-fixes/iproute2/files/iproute2-4.3.0/disable_arpd_in_misc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: iproute2-4.3.0/misc/Makefile -=================================================================== ---- iproute2-4.3.0.orig/misc/Makefile 2015-12-03 17:17:49.164492802 +0100 -+++ iproute2-4.3.0/misc/Makefile 2015-12-03 17:18:39.368493469 +0100 -@@ -5,9 +5,9 @@ - - include ../Config - --ifeq ($(HAVE_BERKELEY_DB),y) -- TARGETS += arpd --endif -+#ifeq ($(HAVE_BERKELEY_DB),y) -+# TARGETS += arpd -+#endif - - ifeq ($(HAVE_SELINUX),y) - LDLIBS += $(shell pkg-config --libs libselinux) diff --git a/yocto-master/iproute2_%.bbappend b/yocto-master/iproute2_%.bbappend deleted file mode 100644 index b10b7ccee3..0000000000 --- a/yocto-master/iproute2_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/iproute2/${PN}_sysmocom.inc From 975d15ac7efa4c458402d173439e792ffa728774 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 17 Feb 2016 23:19:16 +0100 Subject: [PATCH 3/8] iproute2: Re-introduce quirk to add a iproute2-misc package We need the -misc package for extra utilities needed by our tasks. Use the bbappend to create an empty package that pulls in the other utilities. --- yocto-master/iproute2_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 yocto-master/iproute2_%.bbappend diff --git a/yocto-master/iproute2_%.bbappend b/yocto-master/iproute2_%.bbappend new file mode 100644 index 0000000000..433c845367 --- /dev/null +++ b/yocto-master/iproute2_%.bbappend @@ -0,0 +1,4 @@ +PACKAGES += "${PN}-misc" +ALLOW_EMPTY_${PN}-misc = "1" + +RDEPENDS_${PN}-misc = "${PN}-ss ${PN}-nstat ${PN}-ifstat ${PN}-rtacct ${PN}-lnstat" From b271ce4d2368c09fdff1bda6506d5cf30ffcd0b4 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Thu, 18 Feb 2016 20:22:47 +0100 Subject: [PATCH 4/8] sysmocom-defaults: Add more systemd features needed to build Disabling the new "binfmt" doesn't work and breaks the build. I have sent an email to the mailinglist and this might be fixed but at the same time binfmt is split into a new package anyway. At the same time we should enable some items we have now switched off. Once we start to use/stabilize this build we need to check what we need and what the cost is. --- conf/distro/include/sysmocom-defaults.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/distro/include/sysmocom-defaults.conf b/conf/distro/include/sysmocom-defaults.conf index 37140106a2..5d5d2d4dc4 100644 --- a/conf/distro/include/sysmocom-defaults.conf +++ b/conf/distro/include/sysmocom-defaults.conf @@ -30,8 +30,8 @@ USE_NLS = "no" # We don't need x11, nfc, selinux, pam in our builds DISTRO_FEATURES_remove = "x11 nfc selinux pam" -# Get rid off XZ for systemd -PACKAGECONFIG_pn-systemd = "ldconfig" +# Get rid off XZ, xkbcommon, pam, selinux for systemd and many more now +PACKAGECONFIG_pn-systemd = "compat ldconfig binfmt sysusers randomseed myhostname firstboot utmp" # From fido on.. build curl with libssl to avoid gnutls PACKAGECONFIG_pn-curl="ipv6 ssl zlib" From 29ba452c5fe6c98fde70506f478dd2acd98f54ed Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 20 Feb 2016 19:36:25 +0100 Subject: [PATCH 5/8] lmsensors-apps: The code vanished once again, move to fedora --- recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb index 1ca94340d9..d191e7c022 100644 --- a/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb +++ b/recipes-extra/lm_sensors/lmsensors-apps_3.2.0.bb @@ -7,7 +7,7 @@ PR = "r5" DEPENDS = "bison-native flex-native" PACKAGE_ARCH = "${MACHINE_ARCH}" -SRC_URI = "https://downloads.openwrt.org/sources/lm_sensors-${PV}.tar.bz2" +SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/lm_sensors/lm_sensors-${PV}.tar.bz2/829d88fb09d67723fbf42853eb84d1fd/lm_sensors-${PV}.tar.bz2" SRC_URI[md5sum] = "829d88fb09d67723fbf42853eb84d1fd" SRC_URI[sha256sum] = "bde7e1d8b473bca6528694b696668c4cd0a28515aef36b961e4f7d8a6b47e581" From b87c5b4a0c0940150028fed84f667e0c5c2fd53e Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 27 Feb 2016 17:09:51 +0100 Subject: [PATCH 6/8] ntp: Upgrade with security fixes in ntp The upgrade is fixing several known security issues. Let's update it. Fixes: SYS#2449 --- recipes-bsp/ntp/{ntp_4.2.8p1.bb => ntp_4.2.8p6.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename recipes-bsp/ntp/{ntp_4.2.8p1.bb => ntp_4.2.8p6.bb} (97%) diff --git a/recipes-bsp/ntp/ntp_4.2.8p1.bb b/recipes-bsp/ntp/ntp_4.2.8p6.bb similarity index 97% rename from recipes-bsp/ntp/ntp_4.2.8p1.bb rename to recipes-bsp/ntp/ntp_4.2.8p6.bb index e20b08ee0b..0bd7b62041 100644 --- a/recipes-bsp/ntp/ntp_4.2.8p1.bb +++ b/recipes-bsp/ntp/ntp_4.2.8p6.bb @@ -27,8 +27,8 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g PR = "r9" -SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed" -SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88" +SRC_URI[md5sum] = "60049f51e9c8305afe30eb22b711c5c6" +SRC_URI[sha256sum] = "583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048" inherit autotools update-rc.d useradd systemd pkgconfig From 73c143612ac2dab2f13835d719c46d974a30d00a Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Sat, 5 Mar 2016 21:21:10 +0100 Subject: [PATCH 7/8] yocto-master: Remove udev bbappend for the master build In master we use systemd to provide udev and standalone udev has been replaced with eudev. I think we do not need to patch things around here. --- yocto-master/udev_182.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 yocto-master/udev_182.bbappend diff --git a/yocto-master/udev_182.bbappend b/yocto-master/udev_182.bbappend deleted file mode 100644 index 9e035919af..0000000000 --- a/yocto-master/udev_182.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/${PN}/${PN}_sysmocom.inc From f3ffbf4db3a4a6a8c375e44c8d03f63bd4851afb Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 23 Mar 2016 11:50:52 +0100 Subject: [PATCH 8/8] task-sysmocom-feed: Add linux sctp library to the feed libosmo-netif gained SCTP support and we should be able to provide it. Related: SYS#2524 --- recipes-apps/tasks/task-sysmocom-feed.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-apps/tasks/task-sysmocom-feed.bb b/recipes-apps/tasks/task-sysmocom-feed.bb index baffbc00f6..1838b629fe 100644 --- a/recipes-apps/tasks/task-sysmocom-feed.bb +++ b/recipes-apps/tasks/task-sysmocom-feed.bb @@ -3,7 +3,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = " \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" ALLOW_EMPTY_${PN} = "1" -PR = "r20" +PR = "r21" RDEPENDS_${PN} = "\ task-sysmocom-tools \ @@ -16,4 +16,4 @@ RDEPENDS_${PN} = "\ logrotate python-jsonrpclib python-enum iputils \ packagegroup-sysmobts-sob rtl8169-eeprom autossh \ perl libdbd-sqlite-perl libdbi-perl libjson-perl \ - netcat-openbsd perf" + netcat-openbsd perf lksctp-tools"