Use SUSE configurations for buster and sid builds

Author: athos-ribeiro

salt/files/debian_testing.conf

@@ -1,4 +1,228 @@
 
 Repotype: debian
 
-BuildEngine: debootstrap
+# create initial user
+Preinstall: base-passwd
+Preinstall: user-setup
+
+# required for preinstall images
+Preinstall: perl
+
+# preinstall essentials + dependencies
+Preinstall: base-files base-passwd bash bsdutils coreutils dash debconf
+Preinstall: debianutils diffutils dpkg e2fslibs e2fsprogs findutils gawk
+Preinstall: gcc-6-base grep gzip hostname initscripts insserv libacl1
+Preinstall: libattr1 libblkid1 libbz2-1.0 libc-bin libc6 libcom-err2 libdb5.3
+Preinstall: libgcc1 liblzma5 libmount1 libncurses5 libpam-modules
+Preinstall: libpcre3 libsmartcols1 libperl5.26 libdebconfclient0 
+Preinstall: libpam-modules-bin libpam-runtime libpam0g libreadline7
+Preinstall: libselinux1 libsemanage-common libsemanage1 libsepol1 libsigsegv2
+Preinstall: libslang2 libss2 libtinfo6 libustr-1.0-1 libuuid1 login lsb-base
+Preinstall: mount multiarch-support ncurses-base ncurses-bin passwd perl-base
+Preinstall: readline-common sed sensible-utils sysv-rc init-system-helpers sysvinit-utils
+Preinstall: tar tzdata util-linux zlib1g xz-utils
+
+Runscripts: base-passwd user-setup base-files gawk
+
+VMinstall: libdevmapper1.02.1
+
+Order: user-setup:base-files
+
+# Essential packages (this should also pull the dependencies)
+Support: base-files base-passwd bash bsdutils coreutils dash debianutils
+Support: diffutils dpkg e2fsprogs findutils grep gzip hostname libc-bin 
+Support: login mount ncurses-base ncurses-bin perl-base sed init-system-helpers 
+Support: sysvinit-utils tar util-linux
+
+# Build-essentials
+Required: build-essential
+Prefer: build-essential:make
+
+# build script needs fakeroot
+Support: fakeroot
+# lintian support would be nice, but breaks too much atm
+#Support: lintian
+
+# helper tools in the chroot
+Support: less kmod net-tools procps psmisc strace vim
+
+# everything below same as for Debian:6.0 (apart from the version macros ofc)
+
+# circular dependendencies in openjdk stack
+Order: openjdk-6-jre-lib:openjdk-6-jre-headless
+Order: openjdk-6-jre-headless:ca-certificates-java
+
+Keep: binutils cpp cracklib file findutils gawk gcc gcc-ada gcc-c++
+Keep: gzip libada libstdc++ libunwind
+Keep: libunwind-devel libzio make mktemp pam-devel pam-modules
+Keep: patch perl rcs timezone
+
+Prefer: cvs libesd0 libfam0 libfam-dev expect
+
+Prefer: gawk locales default-jdk
+Prefer: xorg-x11-libs libpng fam mozilla mozilla-nss xorg-x11-Mesa
+Prefer: unixODBC libsoup glitz java-1_4_2-sun gnome-panel
+Prefer: desktop-data-SuSE gnome2-SuSE mono-nunit gecko-sharp2
+Prefer: apache2-prefork openmotif-libs ghostscript-mini gtk-sharp
+Prefer: glib-sharp libzypp-zmd-backend mDNSResponder libcom-err2
+
+Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
+Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
+Prefer: -zmd -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links
+Prefer: -crossover-office -libgnutls11-dev
+
+# alternative pkg-config implementation
+Prefer: -pkgconf
+Prefer: -openrc
+Prefer: -file-rc
+
+Conflict: ghostscript-library:ghostscript-mini
+
+#Ignore: sysvinit:initscripts
+
+Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release
+Ignore: gettext-devel:libgcj,libstdc++-devel
+Ignore: pwdutils:openslp
+Ignore: pam-modules:resmgr
+Ignore: rpm:suse-build-key,build-key
+Ignore: bind-utils:bind-libs
+Ignore: alsa:dialog,pciutils
+Ignore: portmap:syslogd
+Ignore: fontconfig:freetype2
+Ignore: fontconfig-devel:freetype2-devel
+Ignore: xorg-x11-libs:freetype2
+Ignore: xorg-x11:x11-tools,resmgr,xkeyboard-config,xorg-x11-Mesa,libusb,freetype2,libjpeg,libpng
+Ignore: apache2:logrotate
+Ignore: arts:alsa,audiofile,resmgr,libogg,libvorbis
+Ignore: kdelibs3:alsa,arts,pcre,OpenEXR,aspell,cups-libs,mDNSResponder,krb5,libjasper
+Ignore: kdelibs3-devel:libvorbis-devel
+Ignore: kdebase3:kdebase3-ksysguardd,OpenEXR,dbus-1,dbus-1-qt,hal,powersave,openslp,libusb
+Ignore: kdebase3-SuSE:release-notes
+Ignore: jack:alsa,libsndfile
+Ignore: libxml2-devel:readline-devel
+Ignore: gnome-vfs2:gnome-mime-data,desktop-file-utils,cdparanoia,dbus-1,dbus-1-glib,krb5,hal,libsmbclient,fam,file_alteration
+Ignore: libgda:file_alteration
+Ignore: gnutls:lzo,libopencdk
+Ignore: gnutls-devel:lzo-devel,libopencdk-devel
+Ignore: pango:cairo,glitz,libpixman,libpng
+Ignore: pango-devel:cairo-devel
+Ignore: cairo-devel:libpixman-devel
+Ignore: libgnomeprint:libgnomecups
+Ignore: libgnomeprintui:libgnomecups
+Ignore: orbit2:libidl
+Ignore: orbit2-devel:libidl,libidl-devel,indent
+Ignore: qt3:libmng
+Ignore: qt-sql:qt_database_plugin
+Ignore: gtk2:libpng,libtiff
+Ignore: libgnomecanvas-devel:glib-devel
+Ignore: libgnomeui:gnome-icon-theme,shared-mime-info
+Ignore: scrollkeeper:docbook_4,sgml-skel
+Ignore: gnome-desktop:libgnomesu,startup-notification
+Ignore: python-devel:python-tk
+Ignore: gnome-pilot:gnome-panel
+Ignore: gnome-panel:control-center2
+Ignore: gnome-menus:kdebase3
+Ignore: gnome-main-menu:rug
+Ignore: libbonoboui:gnome-desktop
+Ignore: postfix:pcre
+Ignore: docbook_4:iso_ent,sgml-skel,xmlcharent
+Ignore: control-center2:nautilus,evolution-data-server,gnome-menus,gstreamer-plugins,gstreamer,metacity,mozilla-nspr,mozilla,libxklavier,gnome-desktop,startup-notification
+Ignore: docbook-xsl-stylesheets:xmlcharent
+Ignore: liby2util-devel:libstdc++-devel,openssl-devel
+Ignore: yast2:yast2-ncurses,yast2-theme-SuSELinux,perl-Config-Crontab,yast2-xml,SuSEfirewall2
+Ignore: yast2-core:netcat,hwinfo,wireless-tools,sysfsutils
+Ignore: yast2-core-devel:libxcrypt-devel,hwinfo-devel,blocxx-devel,sysfsutils,libstdc++-devel
+Ignore: yast2-packagemanager-devel:rpm-devel,curl-devel,openssl-devel
+Ignore: yast2-devtools:perl-XML-Writer,libxslt,pkgconfig
+Ignore: yast2-installation:yast2-update,yast2-mouse,yast2-country,yast2-bootloader,yast2-packager,yast2-network,yast2-online-update,yast2-users,release-notes,autoyast2-installation
+Ignore: yast2-bootloader:bootloader-theme
+Ignore: yast2-packager:yast2-x11
+Ignore: yast2-x11:sax2-libsax-perl
+Ignore: openslp-devel:openssl-devel
+Ignore: java-1_4_2-sun:xorg-x11-libs
+Ignore: java-1_4_2-sun-devel:xorg-x11-libs
+Ignore: kernel-um:xorg-x11-libs
+Ignore: tetex:xorg-x11-libs,expat,fontconfig,freetype2,libjpeg,libpng,ghostscript-x11,xaw3d,gd,dialog,ed
+Ignore: yast2-country:yast2-trans-stats
+Ignore: susehelp:susehelp_lang,suse_help_viewer
+Ignore: mailx:smtp_daemon
+Ignore: cron:smtp_daemon
+Ignore: hotplug:syslog
+Ignore: pcmcia:syslog
+Ignore: avalon-logkit:servlet
+Ignore: jython:servlet
+Ignore: ispell:ispell_dictionary,ispell_english_dictionary
+Ignore: aspell:aspel_dictionary,aspell_dictionary
+Ignore: smartlink-softmodem:kernel,kernel-nongpl
+Ignore: OpenOffice_org-de:myspell-german-dictionary
+Ignore: mediawiki:php-session,php-gettext,php-zlib,php-mysql,mod_php_any
+Ignore: squirrelmail:mod_php_any,php-session,php-gettext,php-iconv,php-mbstring,php-openssl
+
+Ignore: simias:mono(log4net)
+Ignore: zmd:mono(log4net)
+Ignore: horde:mod_php_any,php-gettext,php-mcrypt,php-imap,php-pear-log,php-pear,php-session,php
+Ignore: xerces-j2:xml-commons-apis,xml-commons-resolver
+Ignore: xdg-menu:desktop-data
+Ignore: nessus-libraries:nessus-core
+Ignore: evolution:yelp
+Ignore: mono-tools:mono(gconf-sharp),mono(glade-sharp),mono(gnome-sharp),mono(gtkhtml-sharp),mono(atk-sharp),mono(gdk-sharp),mono(glib-sharp),mono(gtk-sharp),mono(pango-sharp)
+Ignore: gecko-sharp2:mono(glib-sharp),mono(gtk-sharp)
+Ignore: vcdimager:libcdio.so.6,libcdio.so.6(CDIO_6),libiso9660.so.4,libiso9660.so.4(ISO9660_4)
+Ignore: libcdio:libcddb.so.2
+Ignore: gnome-libs:libgnomeui
+Ignore: nautilus:gnome-themes
+Ignore: gnome-panel:gnome-themes
+Ignore: gnome-panel:tomboy
+
+Substitute: utempter
+
+%ifnarch s390 s390x ppc ia64
+Substitute: java2-devel-packages java-1_4_2-sun-devel
+%else
+ %ifnarch s390x
+Substitute: java2-devel-packages java-1_4_2-ibm-devel
+ %else
+Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
+ %endif
+%endif
+
+Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
+
+#
+# SUSE compat mappings
+#
+Substitute: gcc-c++ gcc
+Substitute: libsigc++2-devel libsigc++-2.0-dev
+Substitute: glibc-devel-32bit
+Substitute: pkgconfig pkg-config
+
+
+
+%ifarch %ix86
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
+%endif
+%ifarch ia64
+Substitute: kernel-binary-packages kernel-default kernel-debug
+%endif
+%ifarch x86_64
+Substitute: kernel-binary-packages kernel-default kernel-smp kernel-xen kernel-kdump
+%endif
+%ifarch ppc
+Substitute: kernel-binary-packages kernel-default kernel-kdump kernel-ppc64 kernel-iseries64
+%endif
+%ifarch ppc64
+Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
+%endif
+%ifarch s390
+Substitute: kernel-binary-packages kernel-s390
+%endif
+%ifarch s390x
+Substitute: kernel-binary-packages kernel-default
+%endif
+
+%define debian 9999
+%define debian_version 9999
+
+Macros:
+%debian 9999
+%debian_version 9999

salt/files/debian_unstable.conf

@@ -1,56 +1,84 @@
 
 Repotype: debian
 
-Preinstall: bash perl-base sed grep coreutils debianutils
-Preinstall: libc6 libncurses5 libacl1 libattr1
-Preinstall: libreadline7 tar gawk dpkg
-Preinstall: sysv-rc gzip base-files
+# create initial user
+Preinstall: base-passwd
+Preinstall: user-setup
 
-Runscripts: base-files initscripts
+# required for preinstall images
+Preinstall: perl
 
-VMinstall: util-linux binutils libblkid1 libuuid1 libdevmapper1.02 mount
+# preinstall essentials + dependencies
+Preinstall: base-files base-passwd bash bsdutils coreutils dash debconf
+Preinstall: debianutils diffutils dpkg e2fslibs e2fsprogs findutils gawk
+Preinstall: gcc-6-base grep gzip hostname initscripts insserv libacl1
+Preinstall: libattr1 libblkid1 libbz2-1.0 libc-bin libc6 libcom-err2 libdb5.3
+Preinstall: libgcc1 liblzma5 libmount1 libncurses5 libpam-modules
+Preinstall: libpcre3 libsmartcols1 libperl5.26 libdebconfclient0 
+Preinstall: libpam-modules-bin libpam-runtime libpam0g libreadline7
+Preinstall: libselinux1 libsemanage-common libsemanage1 libsepol1 libsigsegv2
+Preinstall: libslang2 libss2 libtinfo6 libustr-1.0-1 libuuid1 login lsb-base
+Preinstall: mount multiarch-support ncurses-base ncurses-bin passwd perl-base
+Preinstall: readline-common sed sensible-utils sysv-rc init-system-helpers sysvinit-utils
+Preinstall: tar tzdata util-linux zlib1g xz-utils
 
-Required: autoconf automake binutils bzip2 gcc gettext libc6
-Required: libtool libncurses5 perl zlib1g dpkg
+Runscripts: base-passwd user-setup base-files gawk
 
-Support: build-essential fakeroot
-Support: bison cpio libcrack2 cvs login
-Support: file findutils flex diffutils
-Support: groff-base gzip info less
-Support: make man
-Support: net-tools util-linux
-Support: patch procps psmisc rcs strace
-Support: texinfo unzip vim ncurses-base sysvinit-core
+VMinstall: libdevmapper1.02.1
+
+Order: user-setup:base-files
+
+# Essential packages (this should also pull the dependencies)
+Support: base-files base-passwd bash bsdutils coreutils dash debianutils
+Support: diffutils dpkg e2fsprogs findutils grep gzip hostname libc-bin 
+Support: login mount ncurses-base ncurses-bin perl-base sed init-system-helpers 
+Support: sysvinit-utils tar util-linux
+
+# Build-essentials
+Required: build-essential
+Prefer: build-essential:make
+
+# build script needs fakeroot
+Support: fakeroot
+# lintian support would be nice, but breaks too much atm
+#Support: lintian
+
+# helper tools in the chroot
+Support: less kmod net-tools procps psmisc strace vim
+
+# everything below same as for Debian:6.0 (apart from the version macros ofc)
+
+# circular dependendencies in openjdk stack
+Order: openjdk-6-jre-lib:openjdk-6-jre-headless
+Order: openjdk-6-jre-headless:ca-certificates-java
 
 Keep: binutils cpp cracklib file findutils gawk gcc gcc-ada gcc-c++
 Keep: gzip libada libstdc++ libunwind
 Keep: libunwind-devel libzio make mktemp pam-devel pam-modules
 Keep: patch perl rcs timezone
 
+Prefer: cvs libesd0 libfam0 libfam-dev expect
+
+Prefer: gawk locales default-jdk
 Prefer: xorg-x11-libs libpng fam mozilla mozilla-nss xorg-x11-Mesa
 Prefer: unixODBC libsoup glitz java-1_4_2-sun gnome-panel
 Prefer: desktop-data-SuSE gnome2-SuSE mono-nunit gecko-sharp2
 Prefer: apache2-prefork openmotif-libs ghostscript-mini gtk-sharp
-Prefer: glib-sharp libzypp-zmd-backend mDNSResponder
-Prefer: dpkg-dev:make
-Prefer: libcomerr2
-
-Prefer: gnome-sharp2:art-sharp2 gnome-sharp:art-sharp
-Prefer: ifolder3:gnome-sharp2 ifolder3:gconf-sharp2
-Prefer: nautilus-ifolder3:gnome-sharp2
-Prefer: gconf-sharp2:glade-sharp2 gconf-sharp:glade-sharp
-Prefer: tomboy:gconf-sharp tomboy:gnome-sharp
-Prefer: zmd:libzypp-zmd-backend
-Prefer: yast2-packagemanager-devel:yast2-packagemanager
+Prefer: glib-sharp libzypp-zmd-backend mDNSResponder libcom-err2
 
 Prefer: -libgcc-mainline -libstdc++-mainline -gcc-mainline-c++
 Prefer: -libgcj-mainline -viewperf -compat -compat-openssl097g
 Prefer: -zmd -OpenOffice_org -pam-laus -libgcc-tree-ssa -busybox-links
-Prefer: -crossover-office
+Prefer: -crossover-office -libgnutls11-dev
+
+# alternative pkg-config implementation
+Prefer: -pkgconf
+Prefer: -openrc
+Prefer: -file-rc
 
 Conflict: ghostscript-library:ghostscript-mini
 
-Ignore: sysvinit:initscripts
+#Ignore: sysvinit:initscripts
 
 Ignore: aaa_base:aaa_skel,suse-release,logrotate,ash,mingetty,distribution-release
 Ignore: gettext-devel:libgcj,libstdc++-devel
@@ -160,7 +188,15 @@ Substitute: java2-devel-packages java-1_4_2-ibm-devel xorg-x11-libs-32bit
 
 Substitute: yast2-devel-packages docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
 
+#
+# SUSE compat mappings
+#
+Substitute: gcc-c++ gcc
+Substitute: libsigc++2-devel libsigc++-2.0-dev
 Substitute: glibc-devel-32bit
+Substitute: pkgconfig pkg-config
+
+
 
 %ifarch %ix86
 Substitute: kernel-binary-packages kernel-default kernel-smp kernel-bigsmp kernel-debug kernel-um kernel-xen kernel-kdump
@@ -179,10 +215,10 @@ Substitute: kernel-binary-packages kernel-ppc64 kernel-iseries64
 %endif
 %ifarch s390
 Substitute: kernel-binary-packages kernel-s390
-%enidf
+%endif
 %ifarch s390x
 Substitute: kernel-binary-packages kernel-default
-%enidf
+%endif
 
 %define debian 9999
 %define debian_version 9999