diff --git a/openSUSE-MicroOS-release.spec.in b/MicroOS-release.spec.in similarity index 92% rename from openSUSE-MicroOS-release.spec.in rename to MicroOS-release.spec.in index 782df04..5c7780b 100644 --- a/openSUSE-MicroOS-release.spec.in +++ b/MicroOS-release.spec.in @@ -16,7 +16,7 @@ # -Name: openSUSE-MicroOS-release +Name: MicroOS-release Version: ___VERSION___ Release: 0 Summary: ___SUMMARY___ ___BETA_VERSION___ @@ -37,11 +37,13 @@ Provides: distribution-release # MicroOS-release replaces Tumbleweed-Kubic-release Provides: openSUSE-Tumbleweed-Kubic-release 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) Provides: product-update() = dup # 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 -Provides: system-installation() = openSUSE-MicroOS +Provides: system-installation() = MicroOS # bnc#826592 Provides: weakremover(kernel-default) < 3.11 Provides: weakremover(kernel-desktop) < 4.2 @@ -183,9 +185,9 @@ ___FLAVOR_PACKAGES___ %install mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_libexecdir}/issue.d -echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_libexecdir}/issue.d/10-OS -echo -e "\n" > %{buildroot}%{_libexecdir}/issue.d/90-OS +mkdir -p %{buildroot}%{_prefix}/lib/issue.d +echo -e "\nWelcome to ___SUMMARY___ (%{_target_cpu}) - Kernel \\\r (\\\l).\n" > %{buildroot}%{_prefix}/lib/issue.d/10-OS +echo -e "\n" > %{buildroot}%{_prefix}/lib/issue.d/90-OS touch %{buildroot}%{_sysconfdir}/motd @@ -194,14 +196,14 @@ mkdir -p %{buildroot}/%{_sysconfdir}/YaST2/licenses/base cd %{buildroot}/%{_sysconfdir}/YaST2/licenses/base if [ -f /CD1/license.tar.gz ]; then tar -xzf /CD1/license.tar.gz -elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then - tar -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz +elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then + tar -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz fi 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 # We do thus not add it to the os-release file -cat > %{buildroot}%{_libexecdir}/os-release < %{buildroot}%{_prefix}/lib/os-release < openSUSE - openSUSE-MicroOS - openSUSE-MicroOS-release + MicroOS + MicroOS-release 0 - openSUSE-MicroOS + MicroOS openSUSE MicroOS openSUSE MicroOS diff --git a/groups.yml b/groups.yml index 86c0ee6..7d1376c 100644 --- a/groups.yml +++ b/groups.yml @@ -27,7 +27,7 @@ dvd: - kernel-kvmsmall: [locked] - kernel-debug: [locked] - dummy-release: [locked] - - openSUSE-MicroOS-release: [locked] + - MicroOS-release: [locked] - patterns-microos-basesystem: [locked] - openSUSE-Tumbleweed-Kubic-release: [locked] - openSUSE-release-appliance: [locked] @@ -357,6 +357,7 @@ dvd: opensuse_microos: - dummy-release: [locked] - openSUSE-release: [locked] + - openSUSE-MicroOS-release: [locked] # FIXME: remove after dropped - patterns-base-basesystem: [locked] # we need a global flag, not there yet - kernel-vanilla-base: [locked] @@ -364,7 +365,7 @@ opensuse_microos: - kernel-vanilla: [locked] - kernel-kvmsmall: [locked] - kernel-debug: [locked] - - openSUSE-MicroOS-release + - MicroOS-release - kernel-default - patterns-microos-base: [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] - podman-cni-config: [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] # Have a bootable system for RPi3/4 - boo#1172574 - raspberrypi-firmware: [aarch64] # bsc 1130015 @@ -393,6 +389,7 @@ opensuse_microos: - raspberrypi-firmware-dt: [aarch64] # bsc 1130015 - u-boot-rpiarm64: [aarch64] # bsc 1130015, 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: - patterns-microos-desktop-kde: [locked] @@ -404,9 +401,3 @@ opensuse_kubic: - patterns-containers-kubic_admin: [aarch64,ppc64le,s390x,x86_64] - patterns-containers-kubernetes_utilities: [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] diff --git a/openSUSE-release.spec.in b/openSUSE-release.spec.in index 6f4e42c..66f2238 100644 --- a/openSUSE-release.spec.in +++ b/openSUSE-release.spec.in @@ -188,23 +188,23 @@ ___FLAVOR_PACKAGES___ mkdir license if [ -f /CD1/license.tar.gz ]; then tar -C license -xzf /CD1/license.tar.gz -elif [ -f %{_libexecdir}/skelcd/CD1/license.tar.gz ]; then - tar -C license -xzf %{_libexecdir}/skelcd/CD1/license.tar.gz +elif [ -f %{_prefix}/lib/skelcd/CD1/license.tar.gz ]; then + tar -C license -xzf %{_prefix}/lib/skelcd/CD1/license.tar.gz fi %build %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 "\n" > %{buildroot}%{_libexecdir}/issue.d/90-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}%{_prefix}/lib/issue.d/90-openSUSE.conf 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;'` # 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 -cat > %{buildroot}%{_libexecdir}/os-release < %{buildroot}%{_prefix}/lib/os-release < %{buildroot}%{_sysconfdir}/motd # Bug 404141 - /etc/YaST/control.xml should be owned by some package @@ -225,8 +225,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/YaST2/ echo %{buildroot} if [ -f /CD1/control.xml ]; then install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ -elif [ -f %{_libexecdir}/skelcd/CD1/control.xml ]; then - install -m 644 %{_libexecdir}/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ +elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then + install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/ fi # fate#319341, make openSUSE-release own YaST license files. TODO: @@ -258,14 +258,14 @@ fi %_defaultlicensedir/product/base %license license/* %{_sysconfdir}/os-release -%{_libexecdir}/os-release +%{_prefix}/lib/os-release # Bug 404141 - /etc/YaST/control.xml should be owned by some package %dir %{_sysconfdir}/YaST2/ %config %{_sysconfdir}/YaST2/control.xml %config(noreplace) %{_sysconfdir}/motd -%dir %{_libexecdir}/issue.d/ -%{_libexecdir}/issue.d/10-openSUSE.conf -%{_libexecdir}/issue.d/90-openSUSE.conf +%dir %{_prefix}/lib/issue.d/ +%{_prefix}/lib/issue.d/10-openSUSE.conf +%{_prefix}/lib/issue.d/90-openSUSE.conf %config(noreplace) %{_sysconfdir}/issue.net %{_sysconfdir}/products.d