From 4084b16ad27d5b36719ac1137e278f48b1f0596079d30d2b1fe264e286b44560 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Feb 2016 09:23:14 +0000 Subject: [PATCH 1/8] - create also s390x package OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=77 --- baselibs.conf | 11 +++++++++++ syslinux.changes | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..7e67284 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,11 @@ +arch x86_64 targets s390x:64bit + +targetname -x86_64 + +arch x86_64 package syslinux ++.* +-/usr/bin/syslinux +-/usr/bin/extlinux +-/usr/bin/gethostip +-/usr/bin/isohybrid +-/usr/bin/memdiskfind diff --git a/syslinux.changes b/syslinux.changes index 0302ad4..b419279 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 16 09:41:32 CET 2016 - snwint@suse.de + +- create also s390x package + ------------------------------------------------------------------- Thu Feb 11 13:43:14 UTC 2016 - rguenther@suse.com From 54450942cd7924a0ab4055153b26848839e124c9599135387f0d75a82a72e607 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Feb 2016 09:25:01 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=78 --- syslinux.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/syslinux.spec b/syslinux.spec index 40e2625..0667cf4 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -37,6 +37,7 @@ Release: 0 Source: https://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{version}.tar.bz2 Source1: isolinux-config Source2: README.gfxboot +Source3: baselibs.conf Patch0: %{name}-%{version}-iso9660.diff Patch1: %{name}-%{version}-cwd.diff Patch2: %{name}-%{version}-noinitrd.diff From 1ce87b7a3cb3bf4821aa62af6cedb7dac6d64f9e1935df37a97bc295a8d1ed75 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Tue, 16 Feb 2016 11:59:33 +0000 Subject: [PATCH 3/8] - create also s390x package (bsc#964471) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=79 --- syslinux.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syslinux.changes b/syslinux.changes index b419279..ab1d97f 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Feb 16 09:41:32 CET 2016 - snwint@suse.de -- create also s390x package +- create also s390x package (bsc#964471) ------------------------------------------------------------------- Thu Feb 11 13:43:14 UTC 2016 - rguenther@suse.com From 835a9249f376008216952eaeabcbd70c639a30a8ef9a7dbb976417c236d0a3ae Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 24 Feb 2016 15:03:20 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=81 --- baselibs.conf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 7e67284..771379a 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -3,9 +3,9 @@ arch x86_64 targets s390x:64bit targetname -x86_64 arch x86_64 package syslinux -+.* --/usr/bin/syslinux --/usr/bin/extlinux --/usr/bin/gethostip --/usr/bin/isohybrid --/usr/bin/memdiskfind + +.* + -/usr/bin/syslinux + -/usr/bin/extlinux + -/usr/bin/gethostip + -/usr/bin/isohybrid + -/usr/bin/memdiskfind From df642dfde00573f29155176f8e807d69e04bc825ebf10337e78f0577be727b57 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 16 Mar 2016 12:57:44 +0000 Subject: [PATCH 5/8] - fix section alignment (bsc#948445) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=82 --- syslinux-4.04-align.diff | 11 +++++++++++ syslinux.changes | 5 +++++ syslinux.spec | 2 ++ 3 files changed, 18 insertions(+) create mode 100644 syslinux-4.04-align.diff diff --git a/syslinux-4.04-align.diff b/syslinux-4.04-align.diff new file mode 100644 index 0000000..551843b --- /dev/null +++ b/syslinux-4.04-align.diff @@ -0,0 +1,11 @@ +--- core/syslinux.ld ++++ core/syslinux.ld +@@ -263,7 +263,7 @@ + __text_end = .; + } + +- . = ALIGN(16); ++ . = ALIGN(32); + + __rodata_vma = .; + __rodata_lma = __rodata_vma + __text_lma - __text_vma; diff --git a/syslinux.changes b/syslinux.changes index ab1d97f..4707e4e 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 16 13:56:48 CET 2016 - snwint@suse.de + +- fix section alignment (bsc#948445) + ------------------------------------------------------------------- Tue Feb 16 09:41:32 CET 2016 - snwint@suse.de diff --git a/syslinux.spec b/syslinux.spec index 0667cf4..9eff31e 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -55,6 +55,7 @@ Patch14: %{name}-%{version}-timeout.diff Patch15: %{name}-%{version}-cache_fix.diff Patch16: %{name}-%{version}-mtime.diff Patch17: %{name}-%{version}-miniacc.diff +Patch18: %{name}-%{version}-align.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -88,6 +89,7 @@ Authors: %patch15 -p1 %patch16 -p1 %patch17 +%patch18 %build cp %{SOURCE2} . From 1d3e94c8e2d44f7f785a5e725b5e9ed93d5113e157e292aec158860873519c54 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Wed, 16 Mar 2016 16:52:44 +0000 Subject: [PATCH 6/8] - syslinux-4.04-align.diff: fix section alignment (bsc#948445) OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=83 --- syslinux.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syslinux.changes b/syslinux.changes index 4707e4e..a35f6ce 100644 --- a/syslinux.changes +++ b/syslinux.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Mar 16 13:56:48 CET 2016 - snwint@suse.de -- fix section alignment (bsc#948445) +- syslinux-4.04-align.diff: fix section alignment (bsc#948445) ------------------------------------------------------------------- Tue Feb 16 09:41:32 CET 2016 - snwint@suse.de From 49ac4745982b054bb297a95f6f106941ae09704e6747ca6e6670fd4abe984c7e Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 17 Mar 2016 15:39:42 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=84 --- baselibs.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/baselibs.conf b/baselibs.conf index 771379a..334a72e 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,6 +2,8 @@ arch x86_64 targets s390x:64bit targetname -x86_64 +conflicts syslinux + arch x86_64 package syslinux +.* -/usr/bin/syslinux From ea57e5ef35e7726158cad7361ddd50f2275ae7ad6b2c1ef2626af0db906fd6a8 Mon Sep 17 00:00:00 2001 From: Steffen Winterfeldt Date: Thu, 17 Mar 2016 16:14:26 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=85 --- baselibs.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index 334a72e..22101a0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,9 +2,8 @@ arch x86_64 targets s390x:64bit targetname -x86_64 -conflicts syslinux - arch x86_64 package syslinux + conflicts "syslinux" +.* -/usr/bin/syslinux -/usr/bin/extlinux