From 84b1107095cb644234f4da4aed37c91a868e029897d0b0f484cb52241b414869 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 28 Jul 2017 14:31:20 +0000 Subject: [PATCH] Accepting request 512931 from home:fbui:systemd:Factory - Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 - Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) - Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev OBS-URL: https://build.opensuse.org/request/show/512931 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=985 --- systemd-234.tar.xz | 4 ++-- systemd-mini.changes | 26 ++++++++++++++++++++++++++ systemd-mini.spec | 10 ---------- systemd.changes | 26 ++++++++++++++++++++++++++ systemd.spec | 10 ---------- 5 files changed, 54 insertions(+), 22 deletions(-) diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index ebe7c123..53f5ae9d 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2ecf38c4f36975e978edd400fe9405528393b656f97feb6188f45de0a9886091 -size 3350388 +oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1 +size 3350088 diff --git a/systemd-mini.changes b/systemd-mini.changes index 68837bb6..95df3373 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com + +- Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea + + 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 + +------------------------------------------------------------------- +Fri Jul 28 13:06:27 UTC 2017 - fbui@suse.com + +- Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc + + 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) + +------------------------------------------------------------------- +Thu Jul 27 16:55:33 UTC 2017 - fbui@suse.com + +- Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev + + I don't remember why it was added but it looks unnecessary: most of + all systemd components are linked againt libsystemd-shared.so which + includes all the just built symbols. + + Also I don't see why it was done only for systemd-cryptsetup since + all other binaries should have had suffered from the same issue. + ------------------------------------------------------------------- Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 8dcb079e..1ed187ec 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -414,16 +414,6 @@ cp %{SOURCE7} m4/ %endif %build -# -# Be sure that fresh build libudev is found and used at linkage time -# -sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ -systemd_cryptsetup_LDFLAGS =\\\ - $(AM_LDFLAGS)\\\ - -Wl,-rpath-link=$(top_srcdir)/.libs\ - -}' Makefile.am - ./autogen.sh # keep split-usr until all packages have moved their systemd rules to /usr diff --git a/systemd.changes b/systemd.changes index 68837bb6..95df3373 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com + +- Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea + + 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 + +------------------------------------------------------------------- +Fri Jul 28 13:06:27 UTC 2017 - fbui@suse.com + +- Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc + + 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) + +------------------------------------------------------------------- +Thu Jul 27 16:55:33 UTC 2017 - fbui@suse.com + +- Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev + + I don't remember why it was added but it looks unnecessary: most of + all systemd components are linked againt libsystemd-shared.so which + includes all the just built symbols. + + Also I don't see why it was done only for systemd-cryptsetup since + all other binaries should have had suffered from the same issue. + ------------------------------------------------------------------- Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index a6ebaa3a..56d0a028 100644 --- a/systemd.spec +++ b/systemd.spec @@ -412,16 +412,6 @@ cp %{SOURCE7} m4/ %endif %build -# -# Be sure that fresh build libudev is found and used at linkage time -# -sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ -systemd_cryptsetup_LDFLAGS =\\\ - $(AM_LDFLAGS)\\\ - -Wl,-rpath-link=$(top_srcdir)/.libs\ - -}' Makefile.am - ./autogen.sh # keep split-usr until all packages have moved their systemd rules to /usr