1
0

Accepting request 821492 from home:lnussel:branches:home:lnussel:branches:devel:kubic:images

openSUSE-MicroOS -> MicroOS

OBS-URL: https://build.opensuse.org/request/show/821492
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/000package-groups?expand=0&rev=127
This commit is contained in:
Dominique Leuenberger 2020-07-18 19:00:15 +00:00 committed by Git OBS Bridge
commit 844f901568
4 changed files with 36 additions and 43 deletions

View File

@ -16,7 +16,7 @@
# #
Name: openSUSE-MicroOS-release Name: MicroOS-release
Version: ___VERSION___ Version: ___VERSION___
Release: 0 Release: 0
Summary: ___SUMMARY___ ___BETA_VERSION___ Summary: ___SUMMARY___ ___BETA_VERSION___
@ -37,11 +37,13 @@ Provides: distribution-release
# MicroOS-release replaces Tumbleweed-Kubic-release # MicroOS-release replaces Tumbleweed-Kubic-release
Provides: openSUSE-Tumbleweed-Kubic-release Provides: openSUSE-Tumbleweed-Kubic-release
Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324 Obsoletes: openSUSE-Tumbleweed-Kubic-release <= 20190324
Provides: openSUSE-MicroOS-release = %{version}
Obsoletes: openSUSE-MicroOS-release <= %{version}
# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384) # Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
Provides: product-update() = dup Provides: product-update() = dup
# With more than one product in the FTP tree, yast needs to know which products are installable # With more than one product in the FTP tree, yast needs to know which products are installable
# The name is referenced by the control file as well # The name is referenced by the control file as well
Provides: system-installation() = openSUSE-MicroOS Provides: system-installation() = MicroOS
# bnc#826592 # bnc#826592
Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-default) < 3.11
Provides: weakremover(kernel-desktop) < 4.2 Provides: weakremover(kernel-desktop) < 4.2
@ -183,9 +185,9 @@ ___FLAVOR_PACKAGES___
%install %install
mkdir -p %{buildroot}%{_sysconfdir} mkdir -p %{buildroot}%{_sysconfdir}
mkdir -p %{buildroot}%{_libexecdir}/issue.d mkdir -p %{buildroot}%{_prefix}/lib/issue.d
echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS
echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS
touch %{buildroot}%{_sysconfdir}/motd touch %{buildroot}%{_sysconfdir}/motd
@ -194,14 +196,14 @@ mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base
if [ -f /CD1/license.tar.gz ]; then if [ -f /CD1/license.tar.gz ]; then
tar -xzf /CD1/license.tar.gz tar -xzf /CD1/license.tar.gz
elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
tar -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
fi fi
VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'` VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
# note: VERSION is an optional field and has no meaning other than informative on a rolling distro # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
# We do thus not add it to the os-release file # We do thus not add it to the os-release file
cat > %{buildroot}%{_libexecdir}/os-release <<EOF cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
NAME="openSUSE MicroOS" NAME="openSUSE MicroOS"
# VERSION="%{version}%{?betaversion: %{betaversion}}" # VERSION="%{version}%{?betaversion: %{betaversion}}"
ID="opensuse-microos" ID="opensuse-microos"
@ -214,7 +216,7 @@ BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/" HOME_URL="https://www.opensuse.org/"
LOGO="distributor-logo" LOGO="distributor-logo"
EOF EOF
ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
___CREATE_PRODUCT_FILES___ ___CREATE_PRODUCT_FILES___
@ -223,18 +225,18 @@ ___CREATE_PRODUCT_FILES___
# Fix the baseproduct symlink and make sure, it exists # Fix the baseproduct symlink and make sure, it exists
if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then if [ -L %{_sysconfdir}/products.d/baseproduct ] ; then
PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct)) PRODLINK=$(basename $(readlink -f %{_sysconfdir}/products.d/baseproduct))
if [ "$PRODLINK" == "openSUSE-Tumbleweed-Kubic.prod" ]; then if [ "$PRODLINK" = "openSUSE-Tumbleweed-Kubic.prod" -o "$PRODLINK" = "openSUSE-MicroOS.prod" ]; then
rm -f %{_sysconfdir}/products.d/baseproduct rm -f %{_sysconfdir}/products.d/baseproduct
fi fi
fi fi
if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then if [ ! -e %{_sysconfdir}/products.d/baseproduct ]; then
ln -sf openSUSE-MicroOS.prod %{_sysconfdir}/products.d/baseproduct ln -sf MicroOS.prod %{_sysconfdir}/products.d/baseproduct
fi fi
%files %files
%defattr(644,root,root,755) %defattr(644,root,root,755)
%{_sysconfdir}/os-release %{_sysconfdir}/os-release
%{_libexecdir}/os-release %{_prefix}/lib/os-release
%dir %{_sysconfdir}/products.d %dir %{_sysconfdir}/products.d
%{_sysconfdir}/products.d/* %{_sysconfdir}/products.d/*
%dir %{_sysconfdir}/YaST2/ %dir %{_sysconfdir}/YaST2/
@ -244,7 +246,7 @@ fi
# no %doc here, or we will not install them # no %doc here, or we will not install them
%{_sysconfdir}/YaST2/licenses/base/license*txt %{_sysconfdir}/YaST2/licenses/base/license*txt
%{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed %{_sysconfdir}/YaST2/licenses/base/no-acceptance-needed
%dir %{_libexecdir}/issue.d %dir %{_prefix}/lib/issue.d
%{_libexecdir}/issue.d/*-OS %{_prefix}/lib/issue.d/*-OS
%changelog %changelog

View File

@ -3,13 +3,13 @@
<products> <products>
<product> <product>
<vendor>openSUSE</vendor> <vendor>openSUSE</vendor>
<name>openSUSE-MicroOS</name> <name>MicroOS</name>
<releasepkgname>openSUSE-MicroOS-release</releasepkgname> <releasepkgname>MicroOS-release</releasepkgname>
<endoflife/> <endoflife/>
<version></version> <version></version>
<!-- release is no longer optional --> <!-- release is no longer optional -->
<release>0</release> <release>0</release>
<productline>openSUSE-MicroOS</productline> <productline>MicroOS</productline>
<summary>openSUSE MicroOS</summary> <summary>openSUSE MicroOS</summary>
<shortsummary>openSUSE MicroOS</shortsummary> <shortsummary>openSUSE MicroOS</shortsummary>

View File

@ -27,7 +27,7 @@ dvd:
- kernel-kvmsmall: [locked] - kernel-kvmsmall: [locked]
- kernel-debug: [locked] - kernel-debug: [locked]
- dummy-release: [locked] - dummy-release: [locked]
- openSUSE-MicroOS-release: [locked] - MicroOS-release: [locked]
- patterns-microos-basesystem: [locked] - patterns-microos-basesystem: [locked]
- openSUSE-Tumbleweed-Kubic-release: [locked] - openSUSE-Tumbleweed-Kubic-release: [locked]
- openSUSE-release-appliance: [locked] - openSUSE-release-appliance: [locked]
@ -357,6 +357,7 @@ dvd:
opensuse_microos: opensuse_microos:
- dummy-release: [locked] - dummy-release: [locked]
- openSUSE-release: [locked] - openSUSE-release: [locked]
- openSUSE-MicroOS-release: [locked] # FIXME: remove after dropped
- patterns-base-basesystem: [locked] - patterns-base-basesystem: [locked]
# we need a global flag, not there yet # we need a global flag, not there yet
- kernel-vanilla-base: [locked] - kernel-vanilla-base: [locked]
@ -364,7 +365,7 @@ opensuse_microos:
- kernel-vanilla: [locked] - kernel-vanilla: [locked]
- kernel-kvmsmall: [locked] - kernel-kvmsmall: [locked]
- kernel-debug: [locked] - kernel-debug: [locked]
- openSUSE-MicroOS-release - MicroOS-release
- kernel-default - kernel-default
- patterns-microos-base: [aarch64,ppc64le,s390x,x86_64] - patterns-microos-base: [aarch64,ppc64le,s390x,x86_64]
- patterns-microos-defaults: [aarch64,ppc64le,s390x,x86_64] - patterns-microos-defaults: [aarch64,ppc64le,s390x,x86_64]
@ -381,11 +382,6 @@ opensuse_microos:
- patterns-containers-container_runtime: [aarch64,ppc64le,s390x,x86_64] - patterns-containers-container_runtime: [aarch64,ppc64le,s390x,x86_64]
- podman-cni-config: [aarch64,ppc64le,s390x,x86_64] - podman-cni-config: [aarch64,ppc64le,s390x,x86_64]
- kernel-default-base: [aarch64,ppc64le,s390x,x86_64] - kernel-default-base: [aarch64,ppc64le,s390x,x86_64]
- grub2-x86_64-efi: [x86_64]
- grub2-i386-pc: [x86_64]
- grub2-arm64-efi: [aarch64]
- grub2-powerpc-ieee1275: [ppc64le]
- patterns-microos-basesystem: [ppc64le]
- patterns-base-bootloader: [ppc64le] - patterns-base-bootloader: [ppc64le]
# Have a bootable system for RPi3/4 - boo#1172574 # Have a bootable system for RPi3/4 - boo#1172574
- raspberrypi-firmware: [aarch64] # bsc 1130015 - raspberrypi-firmware: [aarch64] # bsc 1130015
@ -393,6 +389,7 @@ opensuse_microos:
- raspberrypi-firmware-dt: [aarch64] # bsc 1130015 - raspberrypi-firmware-dt: [aarch64] # bsc 1130015
- u-boot-rpiarm64: [aarch64] # bsc 1130015, jsc SLE-7276 / bsc 1164080 - u-boot-rpiarm64: [aarch64] # bsc 1130015, jsc SLE-7276 / bsc 1164080
- u-boot-rpiarm64-doc: [aarch64] # jsc SLE-7276 / bsc 1164080 - u-boot-rpiarm64-doc: [aarch64] # jsc SLE-7276 / bsc 1164080
- kdump # needed by yast when the option to enable it is selected
opensuse_kubic: opensuse_kubic:
- patterns-microos-desktop-kde: [locked] - patterns-microos-desktop-kde: [locked]
@ -404,9 +401,3 @@ opensuse_kubic:
- patterns-containers-kubic_admin: [aarch64,ppc64le,s390x,x86_64] - patterns-containers-kubic_admin: [aarch64,ppc64le,s390x,x86_64]
- patterns-containers-kubernetes_utilities: [aarch64,ppc64le,s390x,x86_64] - patterns-containers-kubernetes_utilities: [aarch64,ppc64le,s390x,x86_64]
- patterns-containers-kubic_loadbalancer: [aarch64,ppc64le,s390x,x86_64] - patterns-containers-kubic_loadbalancer: [aarch64,ppc64le,s390x,x86_64]
- grub2-x86_64-efi: [x86_64]
- grub2-i386-pc: [x86_64]
- grub2-arm64-efi: [aarch64]
- grub2-powerpc-ieee1275: [ppc64le]
- patterns-microos-basesystem: [ppc64le]
- patterns-base-bootloader: [ppc64le]

View File

@ -188,23 +188,23 @@ ___FLAVOR_PACKAGES___
mkdir license mkdir license
if [ -f /CD1/license.tar.gz ]; then if [ -f /CD1/license.tar.gz ]; then
tar -C license -xzf /CD1/license.tar.gz tar -C license -xzf /CD1/license.tar.gz
elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then
tar -C license -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz
fi fi
%build %build
%install %install
mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_libexecdir}/issue.d %{buildroot}/run mkdir -p %{buildroot}%{_sysconfdir} %{buildroot}%{_prefix}/lib/issue.d %{buildroot}/run
echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_libexecdir}/issue.d/10-openSUSE.conf echo -e 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel \\r (\\l).\n' > %{buildroot}%{_prefix}/lib/issue.d/10-openSUSE.conf
echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-openSUSE.conf echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-openSUSE.conf
echo 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel %%r (%%t).' > %{buildroot}%{_sysconfdir}/issue.net echo 'Welcome to %{product} %{codename} %{version}%{?betaversion: %{betaversion}} - Kernel %%r (%%t).' > %{buildroot}%{_sysconfdir}/issue.net
VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'` VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
# note: VERSION is an optional field and has no meaning other than informative on a rolling distro # note: VERSION is an optional field and has no meaning other than informative on a rolling distro
# We do thus not add it to the os-release file # We do thus not add it to the os-release file
cat > %{buildroot}%{_libexecdir}/os-release <<EOF cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
NAME="openSUSE Tumbleweed" NAME="openSUSE Tumbleweed"
# VERSION="%{version}%{?betaversion: %{betaversion}}" # VERSION="%{version}%{?betaversion: %{betaversion}}"
ID="opensuse-tumbleweed" ID="opensuse-tumbleweed"
@ -217,7 +217,7 @@ BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/" HOME_URL="https://www.opensuse.org/"
LOGO="distributor-logo" LOGO="distributor-logo"
EOF EOF
ln -s ..%{_libexecdir}/os-release %{buildroot}%{_sysconfdir}/os-release ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
echo "Have a lot of fun..." > %{buildroot}%{_sysconfdir}/motd echo "Have a lot of fun..." > %{buildroot}%{_sysconfdir}/motd
# Bug 404141 - /etc/YaST/control.xml should be owned by some package # Bug 404141 - /etc/YaST/control.xml should be owned by some package
@ -225,8 +225,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2/
echo %{buildroot} echo %{buildroot}
if [ -f /CD1/control.xml ]; then if [ -f /CD1/control.xml ]; then
install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
elif [ -f %{_libexecdir}/skelcd/CD1/control.xml ]; then elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then
install -m 644 %{_libexecdir}/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
fi fi
# fate#319341, make openSUSE-release own YaST license files. TODO: # fate#319341, make openSUSE-release own YaST license files. TODO:
@ -258,14 +258,14 @@ fi
%_defaultlicensedir/product/base %_defaultlicensedir/product/base
%license license/* %license license/*
%{_sysconfdir}/os-release %{_sysconfdir}/os-release
%{_libexecdir}/os-release %{_prefix}/lib/os-release
# Bug 404141 - /etc/YaST/control.xml should be owned by some package # Bug 404141 - /etc/YaST/control.xml should be owned by some package
%dir %{_sysconfdir}/YaST2/ %dir %{_sysconfdir}/YaST2/
%config %{_sysconfdir}/YaST2/control.xml %config %{_sysconfdir}/YaST2/control.xml
%config(noreplace) %{_sysconfdir}/motd %config(noreplace) %{_sysconfdir}/motd
%dir %{_libexecdir}/issue.d/ %dir %{_prefix}/lib/issue.d/
%{_libexecdir}/issue.d/10-openSUSE.conf %{_prefix}/lib/issue.d/10-openSUSE.conf
%{_libexecdir}/issue.d/90-openSUSE.conf %{_prefix}/lib/issue.d/90-openSUSE.conf
%config(noreplace) %{_sysconfdir}/issue.net %config(noreplace) %{_sysconfdir}/issue.net
%{_sysconfdir}/products.d %{_sysconfdir}/products.d