Skip to content

Commit

Permalink
cleanup sl15.0 config
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Oct 6, 2017
1 parent 537c085 commit 97a699b
Showing 1 changed file with 3 additions and 36 deletions.
39 changes: 3 additions & 36 deletions configs/sl15.0.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ Release: lp150.<CI_CNT>.<B_CNT>
Prefer: -libstdc++6-gcc7 -libtsan0-gcc7 -libgomp1-gcc7 -libgcc_s1-gcc7 -libatomic1-gcc7 -libcilkrts5-gcc7 -libitm1-gcc7
Prefer: -liblsan0-gcc7 -libmpx2-gcc7 -libubsan0-gcc7

# kiwi-desc-isoboot pulls in a good set of packages also needed for instsource media (where we have no extra -requires for)
Substitute: kiwi-packagemanager:instsource kiwi-desc-isoboot-requires kiwi-instsource kiwi-instsource-plugins-openSUSE-13-2
Substitute: kiwi-setup:image kiwi createrepo tar -kiwi-desc-isoboot-requires -kiwi-desc-oemboot-requires -kiwi-desc-netboot-requires -kiwi-desc-vmxboot-requires -kiwi-desc-xenboot-requires
Substitute: kiwi-packagemanager:instsource product-builder-plugin-Tumbleweed
Substitute: system-packages:kiwi-product product-builder
Substitute: kiwi-packagemanager: kiwi-packagemanager:zypper

Prefer: installation-images-openSUSE installation-images-debuginfodeps-openSUSE

Expand Down Expand Up @@ -53,38 +53,8 @@ Prefer: libdb-4_8-devel
Prefer: cdrkit-cdrtools-compat genisoimage
VMinstall: util-linux libmount1 perl-base libdb-4_8 libsepol1 libblkid1 libuuid1 libsmartcols1
VMinstall: kernel-obs-build
#VMInstall: iproute2
# we need either ip or ifconfig in the build root. net-tools is in Ring0
# anyways, so use that one
VMInstall: net-tools-deprecated


ExportFilter: \.x86_64\.rpm$ x86_64
ExportFilter: \.ia64\.rpm$ ia64
ExportFilter: \.s390x\.rpm$ s390x
ExportFilter: \.ppc64\.rpm$ ppc64
ExportFilter: \.ppc64le\.rpm$ ppc64le
ExportFilter: \.ppc\.rpm$ ppc
ExportFilter: -ia32-.*\.rpm$
ExportFilter: -32bit-.*\.sparc64\.rpm$
ExportFilter: -64bit-.*\.sparcv9\.rpm$
ExportFilter: -64bit-.*\.aarch64_ilp32\.rpm$
ExportFilter: \.armv7l\.rpm$ armv7l
ExportFilter: \.armv7hl\.rpm$ armv7l
ExportFilter: ^glibc(?:-devel)?-32bit-.*\.sparc64\.rpm$ sparc64
ExportFilter: ^glibc(?:-devel)?-64bit-.*\.sparcv9\.rpm$ sparcv9
# it would be a great idea to have, but sometimes installation-images wants to build debuginfos in
#ExportFilter: -debuginfo-.*\.rpm$
#ExportFilter: -debugsource-.*\.rpm$
#ExportFilter: ^master-boot-code.*\.i586.rpm$ . x86_64
ExportFilter: ^acroread.*\.i586.rpm$ . x86_64
ExportFilter: ^avmailgate.*\.i586.rpm$ . x86_64
ExportFilter: ^avmailgate.*\.ppc.rpm$ . ppc64
ExportFilter: ^avmailgate.*\.s390.rpm$ . s390x
ExportFilter: ^flash-player.*\.i586.rpm$ . x86_64
ExportFilter: ^novell-messenger-client.*\.i586.rpm$ . x86_64
ExportFilter: ^openCryptoki-32bit.*\.s390.rpm$ . s390x

Required: rpm-build
# Build all packages with -pie enabled
Required: gcc-PIE
Expand Down Expand Up @@ -836,11 +806,8 @@ Target: armv6hl-suse-linux
Target: armv7hl-suse-linux
%endif


#Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables
Optflags: * -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables -fasynchronous-unwind-tables

# 13.3 does not exist !
%define suse_version 1500
%define is_opensuse 1

Expand Down

0 comments on commit 97a699b

Please sign in to comment.