Upgrade systemd, dbus and util-linux

similarity index 93%
rename from meta/recipes-core/dbus/dbus-test_1.10.6.bb
rename to meta/recipes-core/dbus/dbus-test_1.10.8.bb
index af99976..87dcd37 100644
@@ -17,8 +17,8 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
            "
 
-SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440"
-SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f"
+SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43"
+SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014"
 
 S="${WORKDIR}/dbus-${PV}"
 FILESEXTRAPATHS =. "${FILE_DIRNAME}/dbus:"

53 lines not on this page · raw message

similarity index 96%
rename from meta/recipes-core/dbus/dbus_1.10.6.bb
rename to meta/recipes-core/dbus/dbus_1.10.8.bb
index 245798a..bfaf65a 100644
@@ -17,11 +17,10 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://dbus-1.init \
            file://os-test.patch \
            file://clear-guid_from_server-if-send_negotiate_unix_f.patch \
-           file://0001-configure.ac-support-large-file-for-stat64.patch \
 "
 
-SRC_URI[md5sum] = "26d0cf3a1c9782cb0e342101f0450440"
-SRC_URI[sha256sum] = "b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f"
+SRC_URI[md5sum] = "e912e930f249454752512aa7ac864d43"
+SRC_URI[sha256sum] = "baf3d22baa26d3bdd9edc587736cd5562196ce67996d65b82103bedbe1f0c014"
 
 inherit useradd autotools pkgconfig gettext update-rc.d upstream-version-is-even
 

index 8247130..f800f42 100644
@@ -14,11 +14,11 @@ LICENSE = "GPLv2 & LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "714c62b46379abb7558c544665522aca91691e10"
+SRCREV = "3a74d4fc90cb322a4784a3515bef7118c8f8c5ba"
 
 SRC_URI = "git://github.com/systemd/systemd.git;protocol=git"
 
-PV = "229+git${SRCPV}"
+PV = "230+git${SRCPV}"
 
 S = "${WORKDIR}/git"
 

index f183261..e62d580 100644
@@ -1,6 +1,3 @@
-From 699893a05edac5194f9670529bacfaeb67252edb Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Mon, 14 Dec 2015 00:42:49 +0000
 Subject: [PATCH 03/36] define exp10 if missing
 
 Inspired by: http://peter.korsgaard.com/patches/alsa-utils/alsamixer-fix-build-on-uClibc-exp10.patch

@@ -11,23 +8,25 @@ Upstream-Status: Pending
 
 Signed-off-by: Samuel Martin <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  src/basic/missing.h | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/src/basic/missing.h b/src/basic/missing.h
-index f3d3236..ee7e7ea 100644
+index 651e414..fafa233 100644
 --- a/src/basic/missing.h
 +++ b/src/basic/missing.h
-@@ -1169,3 +1169,8 @@ static inline key_serial_t request_key(const char *type, const char *description
- #endif
+@@ -1013,4 +1013,9 @@ typedef int32_t key_serial_t;
  
  #endif
-+
+ 
 +#ifdef __UCLIBC__
 +/* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */
 +#define exp10(x) (exp((x) * log(10)))
 +#endif /* __UCLIBC__ */
++
+ #include "missing_syscall.h"
 -- 
-1.8.3.1
+2.8.3
 

151 lines not on this page · raw message

index a351237..f7a5b19 100644
@@ -1,6 +1,3 @@
-From f70a1a9605cd3adac450c49a5a69da6e9acda517 Mon Sep 17 00:00:00 2001
-From: Khem Raj <[email protected]>
-Date: Fri, 20 Feb 2015 05:26:25 +0000
 Subject: [PATCH 15/36] systemd-user: avoid using system-auth
 
 In OE, we don't provide system-auth, instead, we use common-* files.

@@ -10,15 +7,16 @@ Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Chen Qi <[email protected]>
 Signed-off-by: Khem Raj <[email protected]>
+
 ---
  src/login/systemd-user.m4 | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4
-index 7933508..16b73d2 100644
+index f188a8e..862d8d7 100644
 --- a/src/login/systemd-user.m4
 +++ b/src/login/systemd-user.m4
-@@ -2,10 +2,10 @@
+@@ -2,11 +2,11 @@
  #
  # Used by systemd --user instances.
  

@@ -29,8 +27,9 @@ index 7933508..16b73d2 100644
  session  required pam_selinux.so close
  session  required pam_selinux.so nottys open
  )m4_dnl
+ session  required pam_loginuid.so
 -session  include system-auth
-+session  include common-session
++session  include common-account
 -- 
-1.8.3.1
+2.8.3
 

160 lines not on this page · raw message

index 5f3f2e8..5d13e4a 100644
@@ -1,6 +1,3 @@
-From 569cd3cf9806a02226d26c4104dbe44262f93d33 Mon Sep 17 00:00:00 2001
-From: Roy Li <[email protected]>
-Date: Fri, 22 Jan 2016 16:44:11 +0800
 Subject: [PATCH 18/36] make test dir configurable
 
 Upstream-Status: Pending

@@ -9,16 +6,17 @@ test maybe be run on target in cross-compile environment, and test dir
 is not the compilation dir, so make it configurable
 
 Signed-off-by: Roy Li <[email protected]>
+
 ---
  Makefile.am  | 2 +-
  configure.ac | 7 +++++++
  2 files changed, 8 insertions(+), 1 deletion(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index b5c6ba7..d3cd961 100644
+index a94636a..dbd3386 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -203,7 +203,7 @@ AM_CPPFLAGS = \
+@@ -207,7 +207,7 @@ AM_CPPFLAGS = \
  	-DROOTLIBDIR=\"$(rootlibdir)\" \
  	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
  	-DROOTHOMEDIR=\"$(roothomedir)\" \

@@ -28,10 +26,10 @@ index b5c6ba7..d3cd961 100644
  	-I $(top_builddir)/src/basic \
  	-I $(top_srcdir)/src/basic \
 diff --git a/configure.ac b/configure.ac
-index 36d20b5..d96dc5a 100644
+index 45aae8a..c53fae2 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1494,6 +1494,11 @@ AC_ARG_WITH([roothomedir],
+@@ -1518,6 +1518,11 @@ AC_ARG_WITH([roothomedir],
          [],
          [with_roothomedir=/root])
  

@@ -43,7 +41,7 @@ index 36d20b5..d96dc5a 100644
  AC_ARG_WITH([pamlibdir],
          AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]),
          [],
-@@ -1578,6 +1583,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
+@@ -1603,6 +1608,7 @@ AC_SUBST([pamconfdir], [$with_pamconfdir])
  AC_SUBST([rootprefix], [$with_rootprefix])
  AC_SUBST([rootlibdir], [$with_rootlibdir])
  AC_SUBST([roothomedir], [$with_roothomedir])

@@ -51,14 +49,14 @@ index 36d20b5..d96dc5a 100644
  
  AC_CONFIG_FILES([
          Makefile
-@@ -1669,6 +1675,7 @@ AC_MSG_RESULT([
-         lib dir:                 ${libdir}
-         rootlib dir:             ${with_rootlibdir}
-         root home dir:           ${with_roothomedir}
-+        test dir:                ${with_testdir}
-         SysV init scripts:       ${SYSTEM_SYSVINIT_PATH}
-         SysV rc?.d directories:  ${SYSTEM_SYSVRCND_PATH}
-         Build Python:            ${PYTHON}
+@@ -1695,6 +1701,7 @@ AC_MSG_RESULT([
+         lib dir:                           ${libdir}
+         rootlib dir:                       ${with_rootlibdir}
+         root home dir:                     ${with_roothomedir}
++        test dir:                          ${with_testdir}
+         SysV init scripts:                 ${SYSTEM_SYSVINIT_PATH}
+         SysV rc?.d directories:            ${SYSTEM_SYSVRCND_PATH}
+         Build Python:                      ${PYTHON}
 -- 
-1.8.3.1
+2.8.3
 

similarity index 99%
rename from meta/recipes-core/systemd/systemd_229.bb
rename to meta/recipes-core/systemd/systemd_230.bb
index 4b726f3..9afdfa8 100644
@@ -35,7 +35,6 @@ SRC_URI += " \
            file://0020-check-for-uchar.h-in-configure.patch \
            file://0021-include-missing.h-for-getting-secure_getenv-definiti.patch \
            file://0022-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch \
-           file://0023-build-sys-fix-build-with-libgrcypt-disabled.patch \
            file://udev-re-enable-mount-propagation-for-udevd.patch \
 "
 SRC_URI_append_libc-uclibc = "\

@@ -57,7 +56,6 @@ PACKAGECONFIG ??= "xz \
                    machined \
                    backlight \
                    quotacheck \
-                   bootchart \
                    hostnamed \
                    ${@bb.utils.contains('TCLIBC', 'glibc', 'myhostname sysusers', '', d)} \
                    hibernate \

@@ -91,7 +89,6 @@ PACKAGECONFIG[networkd] = "--enable-networkd,--disable-networkd"
 PACKAGECONFIG[machined] = "--enable-machined,--disable-machined"
 PACKAGECONFIG[backlight] = "--enable-backlight,--disable-backlight"
 PACKAGECONFIG[quotacheck] = "--enable-quotacheck,--disable-quotacheck"
-PACKAGECONFIG[bootchart] = "--enable-bootchart,--disable-bootchart"
 PACKAGECONFIG[hostnamed] = "--enable-hostnamed,--disable-hostnamed"
 PACKAGECONFIG[myhostname] = "--enable-myhostname,--disable-myhostname"
 PACKAGECONFIG[rfkill] = "--enable-rfkill,--disable-rfkill"

@@ -314,7 +311,7 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
 FILES_${PN}-initramfs = "/init"
 RDEPENDS_${PN}-initramfs = "${PN}"
 
-RDEPENDS_${PN}-ptest += "gawk make perl bash xz \
+RDEPENDS_${PN}-ptest += "gawk make perl bash xz python\
                          tzdata tzdata-americas tzdata-asia \
                          tzdata-europe tzdata-africa tzdata-antarctica \
                          tzdata-arctic tzdata-atlantic tzdata-australia \

new file mode 100644
index 0000000..7c135cb
@@ -0,0 +1,30 @@
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c \
+                    file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe"
+
+SRC_URI = "git://github.com/systemd/systemd-bootchart.git;protocol=https"
+
+# Modify these as desired
+PV = "230+git${SRCPV}"
+SRCREV = "dcb246b46239259ec99b3c6e6ab7d27e1a5a8a84"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "libxslt-native libxslt-native xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native intltool"
+RDEPENDS_${PN} += "systemd"
+
+inherit pkgconfig autotools systemd
+
+SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service"
+SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+
+do_configure_prepend() {
+    # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot
+    rm ${S}/m4/intltool.m4
+    cp ${STAGING_DIR_TARGET}${datadir}/aclocal/intltool.m4 ${S}/m4/intltool.m4
+}
+
+FILES_${PN} += "${systemd_unitdir}/systemd-bootchart"
+
+EXTRA_OECONF = " --with-rootprefix=${base_prefix} \
+                 --with-rootlibdir=${base_libdir}"

index c0f2540..c2a5b63 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://README.licensing;md5=1715f5ee3e01203ca1e1e0b9ee65918c
                     file://libmount/COPYING;md5=fb93f01d4361069c5616327705373b16 \
                     file://libblkid/COPYING;md5=fb93f01d4361069c5616327705373b16"
 
-inherit autotools gettext pkgconfig systemd update-alternatives python3-dir ptest bash-completion
+inherit autotools gettext pkgconfig systemd update-alternatives python3-dir bash-completion
 DEPENDS = "zlib ncurses"
 DEPENDS_append_class-native = " lzo-native"
 DEPENDS_append_class-nativesdk = " lzo-native"

@@ -281,32 +281,3 @@ python populate_packages_prepend() {
                       description='util-linux lib%s',
                       extra_depends='', prepend=True, allow_links=True)
 }
-
-RDEPENDS_${PN}-ptest = "bash"
-
-do_compile_ptest() {
-    oe_runmake buildtest-TESTS
-}
-
-do_install_ptest() {
-    mkdir -p ${D}${PTEST_PATH}/tests/ts
-    find . -maxdepth 1 -type f -perm -111 -exec cp {} ${D}${PTEST_PATH} \;
-    cp ${S}/tests/functions.sh ${D}${PTEST_PATH}/tests/
-    cp ${S}/tests/commands.sh ${D}${PTEST_PATH}/tests/
-    cp ${S}/tests/run.sh ${D}${PTEST_PATH}/tests/
-    cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected
-
-    list="bitops build-sys cal col colrm column dmesg fsck hexdump hwclock ipcs isosize login look md5 misc more namei paths schedutils script swapon tailf"
-    # The following tests are not installed  yet:
-    # blkid scsi_debug module dependent
-    # cramfs gcc dependent
-    # eject gcc dependent
-    # fdisk scsi_debug module and gcc dependent
-    # lscpu gcc dependant
-    # libmount uuidgen dependent
-    # mount gcc dependant
-    # partx blkid dependant
-    for d in $list; do
-        cp -pR ${S}/tests/ts/$d ${D}${PTEST_PATH}/tests/ts/
-    done
-}

deleted file mode 100644
index 46d4d37..0000000
@@ -1,19 +0,0 @@
-Ptest needs buildtest-TESTS and runtest-TESTS targets.
-serial-tests is required to generate those targets.
-Revert run.sh script accordingly to serialize running tests 
-
-Signed-off-by: Tudor Florea  <[email protected]>
-Upstream-Status: Inappropriate 
-
-diff -ruN a/configure.ac b/configure.ac
---- a/configure.ac	2014-05-27 12:37:42.119772658 +0200
-+++ b/configure.ac	2014-05-27 12:41:46.225573272 +0200
-@@ -10,7 +10,7 @@
- dnl AC_USE_SYSTEM_EXTENSIONS must be called before any macros that run
- dnl the compiler (like AC_PROG_LIBTOOL) to avoid autoconf errors.
- AC_USE_SYSTEM_EXTENSIONS
--AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects])
-+AM_INIT_AUTOMAKE([-Wall foreign 1.10 tar-pax dist-bzip2 no-dist-gzip dist-xz -Wno-portability subdir-objects serial-tests])
-
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])],
- 			    [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])])

57 lines not on this page · raw message

deleted file mode 100644
index 7a63a4e..0000000
@@ -1,20 +0,0 @@
-Avoid unsupported sleep parameter
-
-Signed-off-by: Tudor Florea <[email protected]>
-Upstream-Status: Pending
-
-diff -ruN a/simple b/simple
---- a/tests/ts/tailf/simple	2015-11-12 11:34:49.971817130 +0200
-+++ b/tests/ts/tailf/simple	2013-11-12 11:34:37.876325128 +0200
-@@ -27,9 +27,9 @@
- 
- $TS_CMD_TAILF $INPUT > $TS_OUTPUT 2>&1 &
- 
--sleep 0.5
-+sleep 1
- echo {0..9} >> $INPUT
--sleep 0.5
-+sleep 1
- 
- rm -f $INPUT
- 

deleted file mode 100644
index 0eb8810..0000000
@@ -1,18 +0,0 @@
-Display testname for subtest
-
-Signed-off-by: Tudor Florea <[email protected]>
-Upstream-Status: Pending
-
-diff -ruN a/functions.sh b/functions.sh
---- a/tests/functions.sh	2015-11-12 21:32:02.434542124 +0100
-+++ b/tests/functions.sh	2015-11-12 21:40:37.095317280 +0100
-@@ -297,7 +297,7 @@
- 	if [ "$TS_PARALLEL" == "yes" ]; then
- 		TS_TITLE=$(printf "%13s: %-30s ...\n%16s: %-27s ..." "$TS_COMPONENT" "$TS_DESC" "" "$TS_SUBNAME")
- 	else
--		TS_TITLE=$(printf "%16s: %-27s ..." "" "$TS_SUBNAME")
-+               TS_TITLE=$(printf "%13s: %-30s ..." "$TS_COMPONENT" "$TS_SUBNAME")
- 		echo -n "$TS_TITLE"
- 	fi
- }
-

deleted file mode 100644
index 837f189..0000000
@@ -1,17 +0,0 @@
-Define TESTS variable
-
-Signed-off-by: Tudor Florea <[email protected]>
-Upstream-Status: Pending
-
-diff -ruN a/Makefile.am b/Makefile.am
---- a/Makefile.am	2015-11-12 20:29:46.778396936 +0100
-+++ b/Makefile.am	2015-11-12 20:32:24.342450279 +0100
-@@ -48,7 +48,7 @@
- dist_bashcompletion_DATA =
- check_PROGRAMS =
- dist_check_SCRIPTS =
--TESTS =
-+TESTS = $(check_PROGRAMS)
- 
- PATHFILES =
-

deleted file mode 100644
index fbc2f9b..0000000
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-cd tests || exit 1                                                          
-
-comps=$(find ts/ -type f -perm -111 -regex ".*/[^\.~]*" |  sort)
-
-
-echo
-echo "-------------------- util-linux regression tests --------------------"
-echo
-echo "                    For development purpose only.                    "
-echo "                 Don't execute on production system!                 "
-echo
-
-res=0
-count=0
-for ts in $comps; 
-do 
-   $ts | sed '{        
-      s/^\(.*\):\(.*\) \.\.\. OK$/PASS: \1:\2/                              
-      s/^\(.*\):\(.*\) \.\.\. FAILED \(.*\)$/FAIL: \1:\2 \3/                
-      s/^\(.*\):\(.*\) \.\.\. SKIPPED \(.*\)$/SKIP: \1:\2 \3/               
-   }' 
-done
-

57 lines not on this page · raw message

deleted file mode 100644
index 5773d7e..0000000
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The FHS indicates that /etc must be capable of being mounted R/O.
-
-The FHS also indicates that lock files belong in /var/lock, and /var must
-be R/W as soon as possible during boot.
-
-This patch moves the mtab lock file from the potentially R/O /etc, to the
-R/W /var/lock area.  This lock file is used when mounting disks and making
-other mount adjustments.  The _PATH_MOUNTED_TMP is not adjusted, as failing
-to write to this file does not cause any functional limitations.
-
-(Note, if /etc is R/O, then /etc/mtab should be a symlink to /proc/mounts)
-
-Signed-off-by: Mark Hatle <[email protected]>
-
---- util-linux-ng-2.16/include/pathnames.h.orig
-+++ util-linux-ng-2.16/include/pathnames.h
-@@ -90,7 +90,7 @@
- # endif
- #endif
- 
--#define _PATH_MOUNTED_LOCK	_PATH_MOUNTED "~"
-+#define _PATH_MOUNTED_LOCK	"/var/lock/mtab~"
- #define _PATH_MOUNTED_TMP	_PATH_MOUNTED ".tmp"
- 
- #ifndef _PATH_DEV

92 lines not on this page · raw message

similarity index 44%
rename from meta/recipes-core/util-linux/util-linux_2.27.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.28.bb
index 7549158..fa93b46 100644
@@ -1,28 +1,18 @@
-MAJOR_VERSION = "2.27"
+MAJOR_VERSION = "2.28"
 require util-linux.inc
 
 # To support older hosts, we need to patch and/or revert
 # some upstream changes.  Only do this for native packages.
 OLDHOST = ""
-OLDHOST_class-native = "file://util-linux-native.patch \
-                        file://util-linux-native-qsort.patch \
-			"
+OLDHOST_class-native = "file://util-linux-native-qsort.patch"
 
-SRC_URI += "file://util-linux-ng-2.16-mount_lock_path.patch \
-            file://configure-sbindir.patch \
+SRC_URI += "file://configure-sbindir.patch \
             file://runuser.pamd \
             file://runuser-l.pamd \
             ${OLDHOST} \
-            file://ptest.patch \
-            file://run-ptest \
-            file://avoid_unsupported_sleep_param.patch \
-            file://avoid_unsupported_grep_opts.patch \
-            file://display_testname_for_subtest.patch \
-            file://avoid_parallel_tests.patch \
-            file://uuid-test-error-api.patch \
 "
-SRC_URI[md5sum] = "3cd2698d1363a2c64091c2dadc974647"
-SRC_URI[sha256sum] = "0a818fcdede99aec43ffe6ca5b5388bff80d162f2f7bd4541dca94fecb87a290"
+SRC_URI[md5sum] = "e534e6ccc49107e5d31c329af798ef7d"
+SRC_URI[sha256sum] = "395847e2a18a2c317170f238892751e73a57104565344f8644090c8b091014bb"
 
 CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"