mirror/kde-linux
1
0
Fork 0
mirror of https://github.com/KDE/kde-linux.git synced 2025-12-24 00:18:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

use builtin IMAGE_VERSION variable

Browse Source 
instead of leaking files into the tree
This commit is contained in:
Harald Sitter
2024-03-13 20:11:59 +01:00
parent 42ed5696a9
commit 269b88c0ee
4 changed files with 3 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -2,7 +2,6 @@
# SPDX-FileCopyrightText: none
/image/
/mkosi.cache/
/mkosi.extra/usr/lib/image_version
/version
/*.raw
/*.tar

2
build.sh
View File

@@ -23,8 +23,6 @@ IMG=$OUTPUT.raw
export SYSTEMD_LOG_LEVEL=debug
echo "$VERSION" > ./mkosi.extra/usr/lib/image_version
mkosi --distribution arch --image-id "$NAME" --image-version "$VERSION" "$@"
# NOTE: /efi must be empty so auto mounting can happen. As such we put our templates in a different directory

18
mkosi.finalize.chroot
View File

@@ -4,24 +4,6 @@
set -ex
# mkosi might have eaten the file, restore it
cat <<- EOF > /usr/lib/os-release
NAME="KDE OS"
PRETTY_NAME="KDE OS"
ID=kdeos
BUILD_ID=$(cat /usr/lib/image_version)
ANSI_COLOR="38;2;23;147;209"
HOME_URL="https://os.kde.org/"
DOCUMENTATION_URL="https://userbase.kde.org/KDEOS"
SUPPORT_URL="https://kde.org/support/"
BUG_REPORT_URL="https://bugs.kde.org/enter_bug.cgi?product=KDEOS"
PRIVACY_POLICY_URL="https://kde.org/privacypolicy-apps/"
LOGO=kde-symbolic
IMAGE_VERSION=$(cat /usr/lib/image_version)
EOF
[ -f /usr/lib/os-release ] || false
cat /usr/lib/os-release
deluser --remove builder || true
passwd --delete root
passwd --lock root

6
mkosi.postinst.chroot
View File

@@ -159,7 +159,7 @@ cat <<- EOF > /usr/lib/os-release
NAME="KDE OS"
PRETTY_NAME="KDE OS"
ID=kdeos
BUILD_ID=$(cat /usr/lib/image_version)
BUILD_ID=$IMAGE_VERSION
ANSI_COLOR="38;2;61;174;233"
HOME_URL="https://os.kde.org/"
DOCUMENTATION_URL="https://userbase.kde.org/KDEOS"
@@ -167,7 +167,7 @@ SUPPORT_URL="https://kde.org/support/"
BUG_REPORT_URL="https://bugs.kde.org/enter_bug.cgi?product=KDEOS"
PRIVACY_POLICY_URL="https://kde.org/privacypolicy-apps/"
LOGO=kde-symbolic
IMAGE_VERSION=$(cat /usr/lib/image_version)
IMAGE_VERSION=$IMAGE_VERSION
EOF
[ -f /usr/lib/os-release ] || false
cat /usr/lib/os-release
@@ -205,7 +205,7 @@ ukify build \
--initrd initrd \
--cmdline @cmdline \
--output live.efi
echo "native ro root=PARTLABEL=KDEOS rootflags=subvol=@kdeos_$(cat /usr/lib/image_version) \
echo "native ro root=PARTLABEL=KDEOS rootflags=subvol=@kdeos_$IMAGE_VERSION \
rd.systemd.debug_shell=on systemd.debug_shell=on SYSTEMD_SULOGIN_FORCE=1 \
console=ttyS0 console=tty0 \
systemd.log_level=debug systemd.log_target=kmsg log_buf_len=1M printk.devkmsg=on" > cmdline