diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-gnome/recipes-support | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-gnome/recipes-support')
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch | 25 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch | 28 | ||||
-rw-r--r-- | meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb (renamed from meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb) | 6 |
3 files changed, 2 insertions, 57 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 277f6e21b0..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch +++ /dev/null @@ -1,25 +0,0 @@ -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-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch deleted file mode 100644 index 9db700e96b..0000000000 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera <jkucera@redhat.com> -Date: Wed, 11 Apr 2018 17:13:44 +0200 -Subject: [PATCH] Missing \n in translated string - -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - po/tr.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format --- -2.7.4 - diff --git a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb index 82ccf3eda7..0527836269 100644 --- a/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb +++ b/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb @@ -16,11 +16,9 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', 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" +SRC_URI[md5sum] = "eadfbff18578b645096b6fa61854b41d" +SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |