File project.diff of Package OBS-WorkerOnly-pxe-sle
--- OBS-Appliance.kiwi.orig
+++ OBS-Appliance.kiwi
@@ -13,7 +13,7 @@
<profile name="efi" description="Build for UEFI Firmware" arch="aarch64,x86_64"/>
</profiles>
<preferences profiles="bios">
- <type compressed="true" image="pxe" filesystem="ext4" boot="netboot/suse-tumbleweed" bootprofile="default" bootkernel="std" kernelcmdline="nomodeset kiwikernelmodule=scsi_dh_alua" fsmountoptions="noatime,nobarrier">
+ <type compressed="true" image="pxe" filesystem="ext4" boot="netboot/suse-SLES15" bootprofile="default" bootkernel="std" kernelcmdline="nomodeset kiwikernelmodule=scsi_dh_alua" fsmountoptions="noatime,nobarrier">
<oemconfig>
<oem-swap>false</oem-swap>
<oem-boot-title>OBS Worker</oem-boot-title>
@@ -31,7 +31,7 @@
<bootloader-theme>text</bootloader-theme>
</preferences>
<preferences profiles="efi">
- <type compressed="true" image="pxe" filesystem="ext4" boot="netboot/suse-tumbleweed" bootprofile="default" bootkernel="std" kernelcmdline="nomodeset kiwikernelmodule=scsi_dh_alua" fsmountoptions="noatime,nobarrier" firmware="efi">
+ <type compressed="true" image="pxe" filesystem="ext4" boot="netboot/suse-SLES15" bootprofile="default" bootkernel="std" kernelcmdline="nomodeset kiwikernelmodule=scsi_dh_alua" fsmountoptions="noatime,nobarrier" firmware="efi">
<oemconfig>
<oem-swap>false</oem-swap>
<oem-boot-title>OBS Worker</oem-boot-title>
@@ -94,7 +94,6 @@
<package name="elfutils"/>
<package name="ethtool"/>
<package name="gfxboot" arch="x86_64"/>
- <package name="glib2-branding-openSUSE"/>
<package name="glibc-lang"/>
<package name="grub2"/>
<package name="grub2-arm-efi" arch="armv7l"/>
@@ -142,7 +141,9 @@
<package name="monitoring-plugins-bonding"/>
<package name="monitoring-plugins-cpu_stats"/>
<package name="monitoring-plugins-disk"/>
- <package name="monitoring-plugins-ipmi-sensor1"/>
+ <package name="monitoring-plugins-ipmi-sensor1" arch="aarch64"/>
+ <package name="monitoring-plugins-ipmi-sensor1" arch="ppc64le"/>
+ <package name="monitoring-plugins-ipmi-sensor1" arch="x86_64"/>
<package name="monitoring-plugins-load"/>
<package name="monitoring-plugins-mem"/>
<package name="monitoring-plugins-ntp_time"/>
@@ -169,9 +170,8 @@
<package name="OpenIPMI"/>
<package name="openslp"/> <!-- for automatic worker discovery -->
<package name="openssh"/>
- <package name="openSUSE-build-key"/>
- <package name="openSUSE-release"/>
- <package name="openSUSE-release-mini"/> <!-- base system -->
+ <package name="suse-build-key"/>
+ <package name="sles-release"/>
<package name="pam" bootinclude="true"/>
<package name="pam-config"/>
<package name="parted"/>
@@ -207,7 +207,6 @@
<package name="sysstat"/>
<package name="systemd"/> <!-- help with choice between systemd and systemd-mini -->
<package name="systemd-coredump"/>
- <package name="systemd-presets-branding-openSUSE"/>
<package name="sysvinit-tools"/> <!-- need pidof and such -->
<package name="telnet"/>
<package name="timezone"/>
@@ -220,7 +219,7 @@
<package name="xfsprogs"/>
</packages>
<packages type="bootstrap">
- <package name="openSUSE-release"/>
+ <package name="sles-release"/>
<package name="filesystem"/>
<package name="glibc-locale"/>
</packages>
--- config.sh.orig
+++ config.sh
@@ -159,6 +159,7 @@ chown root.root /var/lib/empty
SERVER="http://download.opensuse.org/"
SERVER="http://obs-admin.obsworker.opensuse.org/obs/"
+ISERVER="http://obs-admin.obsworker.opensuse.org/ibs/"
ARC=`uname -m`
. /etc/os-release
@@ -168,89 +169,52 @@ VLEAP=$VERSION
PORTS=""
O_PREFIX=""
OL_PREFIX=""
+XVERSION=${VERSION//-SP/.}
rm -fv /etc/zypp/repos.d/repo-*.repo
+if grep -qi tumbleweed /etc/os-release ; then
case `uname -m` in
x86_64)
-if grep -qi tumbleweed /etc/os-release ; then
zypper ar -f ${SERVER}/tumbleweed/repo/oss tumbleweed
zypper ar -f ${SERVER}repositories/server:/monitoring/openSUSE_Tumbleweed server:monitoring
zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/openSUSE_Factory OBS:Server:Unstable
zypper ar -f ${SERVER}repositories/openSUSE:/Tools/openSUSE_Factory openSUSE:Tools
-else
-zypper ar -f ${SERVER}distribution/leap/$VERSION/repo/oss openSUSE:Leap:$VERSION
-zypper ar -f ${SERVER}update/leap/$VERSION/oss openSUSE:Leap:$VERSION:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/sle openSUSE:Leap:$VERSION:SLE:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/backports openSUSE:Leap:$VERSION:Backports:Update
-zypper ar -f ${SERVER}repositories/server:/monitoring/$OL_PREFIX$VERSION server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$O_PREFIX$VLEAP OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$O_PREFIX$VLEAP openSUSE:Tools
-fi
- ;;
+ ;;
s390x)
-if grep -qi tumbleweed /etc/os-release ; then
zypper ar -f ${SERVER}ports/zsystems/tumbleweed/repo/oss tumbleweed
zypper ar -f ${SERVER}repositories/server:/monitoring/openSUSE_Factory_zSystems server:monitoring
zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/openSUSE_Factory_zSystems OBS:Server:Unstable
zypper ar -f ${SERVER}repositories/openSUSE:/Tools/openSUSE_Factory_zSystems openSUSE:Tools
-else
-zypper ar -f ${SERVER}distribution/leap/$VERSION/repo/oss openSUSE:Leap:$VERSION
-zypper ar -f ${SERVER}update/leap/$VERSION/oss openSUSE:Leap:$VERSION:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/sle openSUSE:Leap:$VERSION:SLE:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/backports openSUSE:Leap:$VERSION:Backports:Update
-zypper ar -f ${SERVER}repositories/server:/monitoring/$OL_PREFIX${VERSION}${PORTS} server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$O_PREFIX$VLEAP OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$O_PREFIX$VLEAP openSUSE:Tools
-fi
- ;;
+ ;;
ppc64le)
-if grep -qi tumbleweed /etc/os-release ; then
zypper ar -f ${SERVER}ports/ppc/tumbleweed/repo/oss tumbleweed
zypper ar -f ${SERVER}repositories/server:/monitoring/openSUSE_Factory_PowerPC_standard server:monitoring
zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/openSUSE_Factory_PPC OBS:Server:Unstable
zypper ar -f ${SERVER}repositories/openSUSE:/Tools/openSUSE_Factory_PPC openSUSE:Tools
-else
-zypper ar -f ${SERVER}distribution/leap/$VERSION/repo/oss openSUSE:Leap:$VERSION
-zypper ar -f ${SERVER}update/leap/$VERSION/oss openSUSE:Leap:$VERSION:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/sle openSUSE:Leap:$VERSION:SLE:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/backports openSUSE:Leap:$VERSION:Backports:Update
-zypper ar -f ${SERVER}repositories/server:/monitoring/$OL_PREFIX${VERSION}${PORTS} server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$O_PREFIX$VLEAP OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$O_PREFIX$VLEAP openSUSE:Tools
-fi
- ;;
- armv7l)
-if grep -qi tumbleweed /etc/os-release ; then
-zypper ar -f ${SERVER}ports/aarch64/tumbleweed/repo/oss tumbleweed
-zypper ar -f ${SERVER}repositories/server:/monitoring/openSUSE_Factory_ARM server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/openSUSE_Factory_ARM OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/openSUSE_Factory_ARM openSUSE:Tools
-else
-zypper ar -f ${SERVER}ports/armv7hl/distribution/leap/$VERSION/repo/oss openSUSE:Leap:$VERSION
-zypper ar -f ${SERVER}ports/armv7hl/update/leap/$VERSION/oss openSUSE:Leap:$VERSION:Update
-zypper ar -f ${SERVER}repositories/server:/monitoring/$OL_PREFIX${VERSION}${PORTS} server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$O_PREFIX$VERSION OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$O_PREFIX$VLEAP openSUSE:Tools
-fi
- ;;
+ ;;
aarch64)
-if grep -qi tumbleweed /etc/os-release ; then
zypper ar -f ${SERVER}ports/aarch64/tumbleweed/repo/oss tumbleweed
zypper ar -f ${SERVER}repositories/server:/monitoring/openSUSE_Factory_ARM server:monitoring
zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/openSUSE_Factory_ARM OBS:Server:Unstable
zypper ar -f ${SERVER}repositories/openSUSE:/Tools/openSUSE_Factory_ARM openSUSE:Tools
+ ;;
+esac
else
-zypper ar -f ${SERVER}distribution/leap/$VERSION/repo/oss openSUSE:Leap:$VERSION
-zypper ar -f ${SERVER}update/leap/$VERSION/oss openSUSE:Leap:$VERSION:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/sle openSUSE:Leap:$VERSION:SLE:Update
-zypper ar -f ${SERVER}update/leap/$VERSION/backports openSUSE:Leap:$VERSION:Backports:Update
-zypper ar -f ${SERVER}repositories/server:/monitoring/$OL_PREFIX${VERSION}${PORTS} server:monitoring
-zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$O_PREFIX$VLEAP OBS:Server:Unstable
-zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$O_PREFIX$VLEAP openSUSE:Tools
+zypper ar -f ${ISERVER}/SUSE/Products/SLE-Module-Basesystem/$VERSION/$ARC/product SLE-Module-Basesystem-$VERSION-Product
+zypper ar -f ${ISERVER}/SUSE/Updates/SLE-Module-Basesystem/$VERSION/$ARC/update SLE-Module-Basesystem-$VERSION-Update
+zypper ar -f ${ISERVER}/SUSE/Products/SLE-Module-Server-Applications/$VERSION/$ARC/product SLE-Module-Server-Applications-$VERSION-Product
+zypper ar -f ${ISERVER}/SUSE/Updates/SLE-Module-Server-Applications/$VERSION/$ARC/update SLE-Module-Server-Applications-$VERSION-Update
+zypper ar -f ${ISERVER}/SUSE/Products/SLE-Module-Development-Tools/$VERSION/$ARC/product SLE-Module-Development-Tools-$VERSION-Product
+zypper ar -f ${ISERVER}/SUSE/Updates/SLE-Module-Development-Tools/$VERSION/$ARC/update SLE-Module-Development-Tools-$VERSION-Update
+zypper ar -f ${ISERVER}/SUSE/Products/SLE-Module-Development-Tools-OBS/$VERSION/$ARC/product SLE-Module-Development-Tools-OBS-$VERSION-Product
+zypper ar -f ${ISERVER}/SUSE/Updates/SLE-Module-Development-Tools-OBS/$VERSION/$ARC/update SLE-Module-Development-Tools-OBS-$VERSION-Update
+zypper ar -f ${ISERVER}/SUSE/Products/SLE-Module-Legacy/$VERSION/$ARC/product SLE-Module-Legacy-$VERSION-Product
+zypper ar -f ${ISERVER}/SUSE/Updates/SLE-Module-Legacy/$VERSION/$ARC/update SLE-Module-Legacy-$VERSION-Update
+zypper ar -f ${SERVER}repositories/server:/monitoring/SLE_$VER_UND server:monitoring
+zypper ar -f ${SERVER}repositories/OBS:/Server:/Unstable/$XVERSION OBS:Server:Unstable
+zypper ar -f ${SERVER}repositories/openSUSE:/Tools/$XVERSION openSUSE:Tools
fi
- ;;
-esac
#
# import keys
@@ -490,6 +454,39 @@ Y0bH1r5E/rCFhRii/iyCxZN/2KIg/dHo8BXoh5zv
-----END PGP PUBLIC KEY BLOCK-----
EOF
+# import key Backports@build.opensuse.org 8A49EB0325DB7AE0
+cat << EOF > /tmp/keys/t10
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGRbrjQBEACwmRL/YrGlEi8SWHrg16phvxyM0Lr4BMNmmVVS0EajOVT6sh7O
+eOz772YH115o88Oe6y5sZXhzb2q8xZFl4YNBEbB+/JY2Ep5AHje5aQxOMdS6a3G+
+CmohxuJjGQeY0mRP2G6uokgwqLM2LrJVKgO6zPYkb201vk9T89gj0tLCJOpuAZvy
+eUPNqIiXc2h+hm47rw0ZzpVJttczH7RRTLrpobPs6igIQsK96uZNYriiRaI8XVOL
+N2Oj5xhCkM5ksSeCsbVa3fCG38+I30R/Vd+doqeJ0GFej6fCF/e5nFWM/Q39tLa9
+GNxTLpO1PuNGa+Pk+QimOPwcMhJsR/2fUK1HNTOqJlPbMs4RfdeNvm1HvuiPQOoq
+q+WMIgNc1vbEDOyuLJBtwoZX4U6k7c+1XZimWkJMrgpg2da/WwMJ3Mx6crTe9lz1
+l+lQZuDB35c3zkHDRWeeNpHqTXZFx1jhZt44wprkpiCMMFsc1CNdwJPh+ARAFWD3
+B0q8aCWsNwFhwf/0EOEFJUd8kgC3lEwcArxyAwqxfLnnPq6qdLtS2yNZVnX/uzEU
+k5FWcjPaXFsTgryzK+xKJAQ8VDgb2kqkI7PHbkyWJozMukXz92yZXS5CMqYTfxzs
+uv1L4QHf8UO+9jGhyd9Wfr6ZxbRbsAk0rW5LnPG9V4SaqwPSC1Kl1gh3LwARAQAB
+tEZvcGVuU1VTRTpCYWNrcG9ydHMgT0JTIFByb2plY3QgPG9wZW5TVVNFOkJhY2tw
+b3J0c0BidWlsZC5vcGVuc3VzZS5vcmc+iQJUBBMBCAA+FiEE8ETCxQehJitTiqrd
+iknrAyXbeuAFAmRbrjQCGwMFCQeEzgAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AA
+CgkQiknrAyXbeuBchRAAobGt3EQ+lnrXNDnh36Y85NfAqUJ5WdhTSa1IauLbK6nH
+kd5i2qaCBteH/fxOaVZYGxPASdjlSyfJxCrrAMp0oAMr+w2sFMmiyREQTMmlIK2f
+61AkoY4iHKmKl0LfjmWZKublQn8C9DZShHxYZgawvsAB06rDRA8tn1W1Pf+7TfvD
+rRZFekWxu/panUaoh4H8nNfuBrxjliSerAsOM1drIdgdfMPMWjSgsNepPoH4ty2W
+yalbiZqztvRSY3/KDN3qoZ60Ba7hhiqod3/7iqYHQPLl5z/kPwcSNtKX1HPyS/BQ
+2nNrgrxjoI7Nzlk/VEhHuaBpxkVcIy2hekTqwhVxtQf1/FsNIxbckVNs3ns3sJbB
+HUEzvr++P+cmIUIzjX9vTxbQZF417p4nQ16F0onXaXKy5xjgEwY2nmIdsKA2i1Lx
+tnHxr6cV4uoYLWDCIkbJksulcenT7yCJCyMJXZoI7ItzsGt+F7tbK5PFtZBUZNrC
+8RgTUWPexEQuTWCx3VhMzh/N0vUxps8QOzuLtUBwSZfb3FxQysO+pB636ge5CNJa
+JycaO8squEGsZIyNhekHyaLEmmXrmjghTQ3t9IXsIM69+AUjzbbq3bi3L+Cv1REP
+BNEont7uB9w9fTjgcR6TkHGhOcQ4EvDC+XLLAa1ySbbRnQvDnxtNPtgzIKNA5Sg=
+=IXOI
+-----END PGP PUBLIC KEY BLOCK-----
+EOF
+
rpm --import /tmp/keys/t1
rpm --import /tmp/keys/t2
rpm --import /tmp/keys/t3
@@ -499,6 +496,7 @@ rpm --import /tmp/keys/t6
rpm --import /tmp/keys/t7
rpm --import /tmp/keys/t8
rpm --import /tmp/keys/t9
+rpm --import /tmp/keys/t10
rm -rf /tmp/keys
#sed -i -e "s@^PROXY_ENABLED=.*@PROXY_ENABLED=\"yes\"@" \
