Accepting request 751065 from Virtualization:Appliances:Images:openSUSE-Tumbleweed
OBS-URL: https://build.opensuse.org/request/show/751065 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kiwi-templates-JeOS?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
5454d11cad
62
JeOS.kiwi
62
JeOS.kiwi
@ -15,7 +15,6 @@
|
||||
<profile name="MS-HyperV" description="JeOS for Hyper-V" arch="x86_64"/>
|
||||
<profile name="OpenStack-Cloud" description="JeOS for OpenStack Cloud" arch="x86_64"/>
|
||||
<profile name="RaspberryPi" description="JeOS for the Raspberry Pi" arch="aarch64"/>
|
||||
<profile name="RaspberryPi4" description="JeOS for the Raspberry Pi4" arch="aarch64"/>
|
||||
</profiles>
|
||||
<preferences profiles="kvm-and-xen">
|
||||
<version>15.1.0</version>
|
||||
@ -262,51 +261,6 @@
|
||||
</type>
|
||||
</preferences>
|
||||
|
||||
<preferences profiles="RaspberryPi4">
|
||||
<version>15.1.0</version>
|
||||
<packagemanager>zypper</packagemanager>
|
||||
<bootsplash-theme>openSUSE</bootsplash-theme>
|
||||
<bootloader-theme>openSUSE</bootloader-theme>
|
||||
<!-- those settings are applied by suseConfig in config.sh
|
||||
<locale>en_US</locale>
|
||||
<keytable>us.map.gz</keytable>
|
||||
<timezone>Europe/Berlin</timezone>
|
||||
<hwclock>utc</hwclock>
|
||||
-->
|
||||
<rpm-excludedocs>true</rpm-excludedocs>
|
||||
<type
|
||||
image="oem"
|
||||
initrd_system="dracut"
|
||||
filesystem="btrfs"
|
||||
fsmountoptions="noatime,compress=lzo"
|
||||
bootloader="grub2"
|
||||
firmware="efi"
|
||||
kernelcmdline="plymouth.enable=0 cma=64M console=ttyS0,115200 modprobe.blacklist=vc4"
|
||||
bootpartition="false"
|
||||
devicepersistency="by-uuid"
|
||||
btrfs_quota_groups="true"
|
||||
btrfs_root_is_snapshot="true"
|
||||
efipartsize="16"
|
||||
editbootinstall="editbootinstall_rpi.sh"
|
||||
>
|
||||
<systemdisk>
|
||||
<volume name="home"/>
|
||||
<volume name="root"/>
|
||||
<volume name="tmp"/>
|
||||
<volume name="opt"/>
|
||||
<volume name="srv"/>
|
||||
<volume name="boot/grub2/arm64-efi" mountpoint="boot/grub2/arm64-efi"/>
|
||||
<volume name="usr/local"/>
|
||||
<volume name="var" copy_on_write="false"/>
|
||||
</systemdisk>
|
||||
<oemconfig>
|
||||
<oem-swap>true</oem-swap>
|
||||
<oem-swapsize>1000</oem-swapsize>
|
||||
<oem-skip-verify>true</oem-skip-verify>
|
||||
</oemconfig>
|
||||
</type>
|
||||
</preferences>
|
||||
|
||||
<repository type="rpm-md" >
|
||||
<source path='obsrepositories:/'/>
|
||||
</repository>
|
||||
@ -343,19 +297,18 @@
|
||||
<package name="openSUSE-build-key"/>
|
||||
<package name="systemd"/>
|
||||
<package name="systemd-sysvinit"/>
|
||||
<package name="systemd-logger"/> <!-- To have a persistent journal -->
|
||||
<package name="timezone"/>
|
||||
<package name="wicked"/>
|
||||
<package name="iproute2"/>
|
||||
<package name="openssh"/>
|
||||
<package name="rsync"/>
|
||||
<package name="salt-minion"/>
|
||||
<!-- Do we need this for Leap?
|
||||
<package name="jeos-licenses"/> -->
|
||||
<package name="dosfstools"/> <!-- For fscking /boot/efi -->
|
||||
<package name="live-add-yast-repos"/>
|
||||
</packages>
|
||||
|
||||
<!-- Not needed in OpenStack as it uses XFS and cloud-init -->
|
||||
<packages type="image" profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi,RaspberryPi4">
|
||||
<packages type="image" profiles="kvm-and-xen,XEN,VMware,MS-HyperV,RaspberryPi">
|
||||
<!-- Only for btrfs -->
|
||||
<package name="btrfsprogs"/>
|
||||
<package name="btrfsmaintenance"/>
|
||||
@ -393,7 +346,7 @@
|
||||
<package name="kernel-default-base"/>
|
||||
<!--<package name="python-azure-agent"/> disabled until bsc#1061584 is fixed -->
|
||||
</packages>
|
||||
<packages type="image" profiles="RaspberryPi,RaspberryPi4">
|
||||
<packages type="image" profiles="RaspberryPi">
|
||||
<package name="raspberrypi-firmware" arch="aarch64"/>
|
||||
<package name="raspberrypi-firmware-config" arch="aarch64"/>
|
||||
<package name="raspberrypi-firmware-dt" arch="aarch64"/>
|
||||
@ -403,12 +356,7 @@
|
||||
<package name="jeos-firstboot-rpiwifi"/>
|
||||
<package name="bcm43xx-firmware"/>
|
||||
<package name="kernel-firmware"/><!-- Fix choice between kernel-firmware and kernel-firmware-all -->
|
||||
</packages>
|
||||
<packages type="image" profiles="RaspberryPi">
|
||||
<package name="u-boot-rpi3" arch="aarch64"/>
|
||||
</packages>
|
||||
<packages type="image" profiles="RaspberryPi4">
|
||||
<package name="u-boot-rpi4" arch="aarch64"/>
|
||||
<package name="u-boot-rpiarm64" arch="aarch64"/>
|
||||
</packages>
|
||||
|
||||
<!-- TW does not have those release packages
|
||||
|
||||
@ -5,5 +5,4 @@
|
||||
<flavor>MS-HyperV</flavor>
|
||||
<flavor>OpenStack-Cloud</flavor>
|
||||
<flavor>RaspberryPi</flavor>
|
||||
<flavor>RaspberryPi4</flavor>
|
||||
</multibuild>
|
||||
|
||||
@ -93,14 +93,6 @@ else
|
||||
|
||||
systemctl mask systemd-firstboot.service
|
||||
systemctl enable jeos-firstboot.service
|
||||
|
||||
# Only RPi has no HW RTC, so avoid bsc#1146374 for other platforms
|
||||
# Do not enable chrony on RPi4 for now, as it waits for
|
||||
# ever to get a not-yet-existing network connection.
|
||||
if [[ "$kiwi_profiles" == *"RaspberryPi" ]]; then
|
||||
# Make sure jeos-firstboot can rely on synced time (bsc#1129730)
|
||||
systemctl enable chrony-wait.service
|
||||
fi
|
||||
fi
|
||||
|
||||
# Enable firewalld if installed
|
||||
|
||||
@ -1,3 +1,21 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 26 13:11:12 UTC 2019 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Don't enable chrony-wait even on RPi, it might delay booting
|
||||
unacceptably long
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 20 14:36:54 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
|
||||
|
||||
- Enable one image for RPi3/4
|
||||
* delete obsolete RPi4 target
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 20 12:59:31 UTC 2019 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- Add systemd-logger and dosfstools
|
||||
- Drop salt-minion
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 25 09:16:36 UTC 2019 - Matthias Brugger <mbrugger@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package kiwi-templates-JeOS
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -29,7 +29,7 @@ BuildArch: noarch
|
||||
Summary: KIWI - openSUSE Tumbleweed JeOS image templates
|
||||
License: MIT
|
||||
Group: System/Management
|
||||
Url: https://www.opensuse.org/
|
||||
URL: https://www.opensuse.org/
|
||||
Source01: config.sh
|
||||
Source02: JeOS.kiwi
|
||||
Source03: editbootinstall_rpi.sh
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user