Compare commits
No commits in common. "f692add983ba372d500de18ac6f78e7a44ff8f94" and "e672f281ef5b5d71999ce39e66970c3a93ea6c96" have entirely different histories.
f692add983
...
e672f281ef
@ -129,6 +129,9 @@ def kiwiBuild(profile):
|
||||
|
||||
|
||||
def packageBuild(target):
|
||||
# TODO: rewrite in python instead of shelling out
|
||||
runCommand(["./make-asahi-installer-package.sh"])
|
||||
|
||||
base = f"fedora-{RELEASE}-{target['id']}-{BUILDVER}"
|
||||
os.rename(f"fedora-{RELEASE}-{BUILDVER}.zip", f"{base}.zip")
|
||||
os.rename(f"fedora-{RELEASE}-{BUILDVER}.logs.zip", f"{base}.logs.zip")
|
||||
|
||||
@ -5,15 +5,19 @@
|
||||
<packages type="image" patternType="plusRecommended" profiles="Common">
|
||||
<namedCollection name="core"/>
|
||||
<namedCollection name="standard"/>
|
||||
|
||||
<namedCollection name="hardware-support"/>
|
||||
<package name="NetworkManager-wifi"/>
|
||||
<package name="chrony"/>
|
||||
<package name="initial-setup"/>
|
||||
<package name="glibc-all-langpacks"/>
|
||||
<package name="shadow-utils"/>
|
||||
|
||||
<ignore name="abrt-cli"/>
|
||||
<ignore name="dracut-config-rescue"/>
|
||||
<ignore name="generic-release*"/>
|
||||
<ignore name="generic-logos*"/>
|
||||
<!-- Asahi packages -->
|
||||
<package name="alsa-ucm-asahi"/>
|
||||
<package name="asahi-platform-metapackage"/>
|
||||
<package name="asahi-repos"/>
|
||||
<package name="fedora-asahi-remix-scripts"/>
|
||||
<package name="tiny-dfr"/>
|
||||
</packages>
|
||||
</image>
|
||||
|
||||
@ -3,13 +3,21 @@
|
||||
<profile name="BootCore" description="Boot core packages"/>
|
||||
</profiles>
|
||||
<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore">
|
||||
<package name="sdubby"/>
|
||||
<package name="grubby"/>
|
||||
</packages>
|
||||
<packages type="image" patternType="plusRecommended" profiles="BootCore">
|
||||
<package name="kernel"/>
|
||||
<package name="kernel-modules-extra"/>
|
||||
<package name="systemd-boot-unsigned"/>
|
||||
<package name="grub2-efi-aa64" arch="aarch64"/>
|
||||
<package name="grub2-efi-aa64-modules" arch="aarch64"/>
|
||||
<package name="shim-signed-aa64" arch="aarch64"/>
|
||||
<package name="grub2-efi-aa64" arch="aarch64"/>
|
||||
<package name="uboot-images-armv8" arch="aarch64"/>
|
||||
<package name="kernel-16k"/>
|
||||
<package name="kernel-16k-modules-extra"/>
|
||||
<package name="systemd-oomd-defaults"/>
|
||||
<package name="systemd-resolved"/>
|
||||
<!-- Asahi packages -->
|
||||
<package name="asahi-fwextract" arch="aarch64"/>
|
||||
<package name="dracut-asahi" arch="aarch64"/>
|
||||
<package name="update-m1n1" arch="aarch64"/>
|
||||
</packages>
|
||||
</image>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<image>
|
||||
<users profiles="Azure,AWSEC2,OpenStack,LiveInstall">
|
||||
<user name="root" groups="root" home="/root" password="fedora_rocks!" pwdformat="plain" />
|
||||
<user name="riscv" groups="riscv,wheel" home="/home/riscv" password="fedora_rocks!" pwdformat="plain" />
|
||||
<!-- The password here does not matter, it will be erased in config.sh -->
|
||||
<user name="root" groups="root" password="linux" home="/root" pwdformat="plain" />
|
||||
</users>
|
||||
</image>
|
||||
|
||||
45
config.sh
45
config.sh
@ -33,6 +33,23 @@ echo 'uninitialized' > /etc/machine-id
|
||||
## remove random seed, the newly installed instance should make its own
|
||||
rm -f /var/lib/systemd/random-seed
|
||||
|
||||
#======================================
|
||||
# Configure grub correctly
|
||||
#--------------------------------------
|
||||
## Works around issues with grub-bls
|
||||
## See: https://github.com/OSInside/kiwi/issues/2198
|
||||
echo "GRUB_DEFAULT=saved" >> /etc/default/grub
|
||||
## Disable submenus to match Fedora
|
||||
echo "GRUB_DISABLE_SUBMENU=true" >> /etc/default/grub
|
||||
## Disable recovery entries to match Fedora
|
||||
echo "GRUB_DISABLE_RECOVERY=true" >> /etc/default/grub
|
||||
|
||||
#======================================
|
||||
# Delete & lock the root user password
|
||||
#--------------------------------------
|
||||
passwd -d root
|
||||
passwd -l root
|
||||
|
||||
#======================================
|
||||
# Setup default services
|
||||
#--------------------------------------
|
||||
@ -40,6 +57,27 @@ rm -f /var/lib/systemd/random-seed
|
||||
## Enable persistent journal
|
||||
mkdir -p /var/log/journal
|
||||
|
||||
#======================================
|
||||
# Setup firstboot initial setup
|
||||
#--------------------------------------
|
||||
|
||||
if [[ "$kiwi_profiles" == *"KDE"* ]]; then
|
||||
## Enable calamares
|
||||
systemctl enable calamares-firstboot.service
|
||||
elif [[ "$kiwi_profiles" != *"GNOME"* ]] && [[ "$kiwi_profiles" != *"KDE"* ]]; then
|
||||
## Enable initial-setup
|
||||
systemctl enable initial-setup.service
|
||||
## Enable reconfig mode
|
||||
touch /etc/reconfigSys
|
||||
fi
|
||||
|
||||
## Enable swap setup on firstboot
|
||||
systemctl enable asahi-setup-swap-firstboot.service
|
||||
|
||||
## Enable extras install on firstboot; this will only run if the extras are
|
||||
## actually present (and self disable afterwards)
|
||||
systemctl enable asahi-extras-firstboot.service
|
||||
|
||||
#======================================
|
||||
# Setup default target
|
||||
#--------------------------------------
|
||||
@ -61,4 +99,11 @@ rpm -qa --qf '%{size}\t%{name}-%{version}-%{release}.%{arch}\n' |sort -rn
|
||||
# Note that running rpm recreates the rpm db files which aren't needed or wanted
|
||||
rm -f /var/lib/rpm/__db*
|
||||
|
||||
#======================================
|
||||
# Generate boot.bin
|
||||
#======================================
|
||||
mkdir -p /boot/efi/m1n1
|
||||
update-m1n1 /boot/efi/m1n1/boot.bin
|
||||
rm /boot/.builder
|
||||
|
||||
exit 0
|
||||
|
||||
@ -13,9 +13,10 @@
|
||||
<keytable>us</keytable>
|
||||
<timezone>UTC</timezone>
|
||||
<rpm-check-signatures>true</rpm-check-signatures>
|
||||
<release-version>40</release-version>
|
||||
<release-version>rawhide</release-version>
|
||||
</preferences>
|
||||
<include from="this://./repositories/core.xml"/>
|
||||
<include from="this://./repositories/asahi.xml"/>
|
||||
<include from="this://./components/boot.xml"/>
|
||||
<include from="this://./components/base.xml"/>
|
||||
<include from="this://./components/desktop-environments.xml"/>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</profiles>
|
||||
<preferences profiles="Minimal">
|
||||
<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
|
||||
<bootloader name="systemd_boot"/>
|
||||
<bootloader name="grub2" console="none" timeout="5" timeout_style="menu"/>
|
||||
<systemdisk name="fedora">
|
||||
<volume name="@root=root"/>
|
||||
<volume name="home" parent="/"/>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
</profiles>
|
||||
<preferences profiles="Server">
|
||||
<type image="oem" filesystem="btrfs" kernelcmdline="" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
|
||||
<bootloader name="systemd_boot"/>
|
||||
<bootloader name="grub2" console="none" timeout="5" timeout_style="menu"/>
|
||||
<systemdisk name="fedora">
|
||||
<volume name="@root=root"/>
|
||||
<volume name="home" parent="/"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
</profiles>
|
||||
<preferences profiles="WorkstationCommon">
|
||||
<type image="oem" filesystem="btrfs" kernelcmdline="rhgb quiet" target_blocksize="4096" bootpartition="true" bootpartsize="1024" bootfilesystem="ext4" efipartsize="500" firmware="uefi" btrfs_root_is_subvolume="true" btrfs_set_default_volume="false" rootfs_label="fedora" fsmountoptions="x-systemd.growfs,compress=zstd:1">
|
||||
<bootloader name="systemd_boot"/>
|
||||
<bootloader name="grub2" console="console" timeout="1" timeout_style="hidden"/>
|
||||
<systemdisk name="fedora">
|
||||
<volume name="@root=root"/>
|
||||
<volume name="home" parent="/"/>
|
||||
|
||||
@ -1,5 +1,12 @@
|
||||
<image>
|
||||
<repository type="rpm-md" alias="fedora" sourcetype="baseurl">
|
||||
<source path="http://fedora.riscv.rocks/repos-dist/f$releasever/latest/$basearch"></source>
|
||||
<repository type="rpm-md" alias="fedora" sourcetype="metalink">
|
||||
<source path="https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch">
|
||||
<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
|
||||
</source>
|
||||
</repository>
|
||||
<repository type="rpm-md" alias="updates" sourcetype="metalink">
|
||||
<source path="https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch">
|
||||
<signing key="file:///usr/share/distribution-gpg-keys/fedora/RPM-GPG-KEY-fedora-$releasever-primary"/>
|
||||
</source>
|
||||
</repository>
|
||||
</image>
|
||||
|
||||
@ -1 +1 @@
|
||||
core-nonrawhide.xml
|
||||
core-rawhide.xml
|
||||
@ -3,4 +3,4 @@
|
||||
UPDATEDEFAULT=yes
|
||||
|
||||
# DEFAULTKERNEL specifies the default kernel package type
|
||||
DEFAULTKERNEL=kernel-core
|
||||
DEFAULTKERNEL=kernel-16k-core
|
||||
|
||||
Loading…
Reference in New Issue
Block a user