mirror of
https://github.com/KDE/kde-linux.git
synced 2025-12-24 00:18:23 -05:00
rename all files to kde-linux
This commit is contained in:
Harald Sitter
@@ -49,7 +49,7 @@ mount -t tmpfs tmpfs "$ROOT/run"
|
||||
mkdir "$ROOT/run/udev"
|
||||
mount -o bind /run/udev "$ROOT/run/udev"
|
||||
mount -t efivarfs efivarfs "$ROOT/sys/firmware/efi/efivars"
|
||||
_kdeos-overlay "$device" "$ROOT"
|
||||
_kde-linux-overlay "$device" "$ROOT"
|
||||
|
||||
# ESP is a bit tricky. Find the block device of the root partition and then we'll ask systemd for an ESP on that device.
|
||||
# ... and luks devices are even more tricky because we need to get the real device first
|
||||
@@ -61,7 +61,7 @@ if [ -r "/sys/block/$realdevice/dm/" ]; then
|
||||
done
|
||||
fi
|
||||
blockdev=/dev/$(basename "$(readlink --canonicalize "/sys/class/block/$realdevice/..")")
|
||||
espdev=$(_kdeos-find-esp "$blockdev")
|
||||
espdev=$(_kde-linux-find-esp "$blockdev")
|
||||
mount "$espdev" "$ROOT/efi"
|
||||
|
||||
# Once everything is in place we'll shove some extra data into the overlays.
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# SPDX-FileCopyrightText: 2019-2021 Harald Sitter <sitter@kde.org>
|
||||
# SPDX-FileCopyrightText: 2017 Jonathan Riddell <jr@jriddell.org>
|
||||
---
|
||||
componentName: kdeos
|
||||
componentName: kde-linux
|
||||
|
||||
strings:
|
||||
productName: "${NAME}"
|
||||
|
||||
@@ -40,5 +40,5 @@ sequence:
|
||||
- show:
|
||||
- finished
|
||||
|
||||
branding: kdeos
|
||||
branding: kde-linux
|
||||
prompt-install: false
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
# SPDX-FileCopyrightText: 2024 Harald Sitter <sitter@kde.org>
|
||||
|
||||
# Bless Session.
|
||||
# Also see _kdeos-bless-userspace
|
||||
# Also see _kde-linux-bless-userspace
|
||||
|
||||
set -ex
|
||||
|
||||
touch "${XDG_RUNTIME_DIR}/kdeos-bless-session"
|
||||
touch "${XDG_RUNTIME_DIR}/kde-linux-bless-session"
|
||||
@@ -3,7 +3,7 @@
|
||||
# SPDX-FileCopyrightText: 2024 Harald Sitter <sitter@kde.org>
|
||||
|
||||
# Bless userspace.
|
||||
# Blessing of a boot on KDEOS is a three step process.
|
||||
# Blessing of a boot on KDE Linux is a three step process.
|
||||
# 1) the userspace gets blessed here via a /run marker (means system-wide middleware services are up - such as networkmanager)
|
||||
# 2) the user logs in and a complete session startup blesses the session
|
||||
# 3) when all requirements are met the boot gets actually blessed
|
||||
@@ -15,4 +15,4 @@ systemctl daemon-reload
|
||||
|
||||
/usr/lib/systemd/systemd-bless-boot indeterminate
|
||||
|
||||
touch /run/kdeos-bless-userspace
|
||||
touch /run/kde-linux-bless-userspace
|
||||
@@ -5,13 +5,13 @@
|
||||
build() {
|
||||
map add_binary \
|
||||
/usr/lib/systemd/systemd-volatile-root \
|
||||
/usr/bin/_kdeos-overlay \
|
||||
/usr/bin/_kde-linux-overlay \
|
||||
/usr/lib/systemd/system-generators/kde-linux-live-generator \
|
||||
/usr/lib/systemd/systemd-bootchart \
|
||||
/usr/bin/btrfs
|
||||
|
||||
map add_systemd_unit \
|
||||
systemd-volatile-root.service \
|
||||
kdeos-overlay.service \
|
||||
kde-linux-overlay.service \
|
||||
systemd-bootchart.service
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ enable kde-linux-btrfs.service
|
||||
enable kde-linux-live-setup.service
|
||||
enable kde-linux-volatile-var-lib-flatpak.service
|
||||
enable plasma-setup-live-system.service
|
||||
enable kdeos-overlay.service
|
||||
enable kde-linux-overlay.service
|
||||
enable var-lib-snapd-snap.mount
|
||||
|
||||
# networkd - we use networkmanager
|
||||
@@ -0,0 +1 @@
|
||||
../kde-linux-overlay.service
|
||||
@@ -1 +0,0 @@
|
||||
../kdeos-overlay.service
|
||||
@@ -0,0 +1 @@
|
||||
../kde-linux-overlay.service
|
||||
@@ -1 +0,0 @@
|
||||
../kdeos-overlay.service
|
||||
@@ -5,5 +5,5 @@
|
||||
Description=Mark the Current Boot Loader Entry as Good
|
||||
|
||||
[Path]
|
||||
PathExistsGlob=/run/kdeos-bless-userspace
|
||||
PathExistsGlob=/run/user/*/kdeos-bless-session
|
||||
PathExistsGlob=/run/kde-linux-bless-userspace
|
||||
PathExistsGlob=/run/user/*/kde-linux-bless-session
|
||||
@@ -6,11 +6,11 @@ Description=Check if Userspace is in a Good State
|
||||
Requires=boot-complete.target display-manager.service user.slice
|
||||
Conflicts=shutdown.target
|
||||
Before=shutdown.target systemd-bless-boot.service
|
||||
Wants=kdeos-bless-boot.path
|
||||
Wants=kde-linux-bless-boot.path
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/_kdeos-bless-userspace
|
||||
ExecStart=/bin/_kde-linux-bless-userspace
|
||||
|
||||
[Install]
|
||||
RequiredBy=systemd-bless-boot.service
|
||||
@@ -18,5 +18,5 @@ After=modprobe@overlay.service
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/bin/_kdeos-overlay
|
||||
ExecStart=/usr/bin/_kde-linux-overlay
|
||||
Restart=no
|
||||
@@ -0,0 +1 @@
|
||||
../kde-linux-bless-userspace.service
|
||||
@@ -1 +0,0 @@
|
||||
../kdeos-bless-userspace.service
|
||||
@@ -0,0 +1 @@
|
||||
../kde-linux-bless-session.service
|
||||
@@ -1 +0,0 @@
|
||||
../kdeos-bless-session.service
|
||||
@@ -8,7 +8,7 @@ Requires=graphical-session.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/bin/_kdeos-bless-session
|
||||
ExecStart=/bin/_kde-linux-bless-session
|
||||
|
||||
[Install]
|
||||
WantedBy=graphical-session.target
|
||||
@@ -5,11 +5,11 @@
|
||||
SPDX-FileCopyrightText: 2024 Harald Sitter <sitter@kde.org>
|
||||
-->
|
||||
<os id="http://kde.org/os">
|
||||
<short-id>kdeos</short-id>
|
||||
<name>KDE OS</name>
|
||||
<short-id>kde-linux</short-id>
|
||||
<name>KDE Linux</name>
|
||||
<vendor>KDE</vendor>
|
||||
<family>linux</family>
|
||||
<distro>kdeos</distro>
|
||||
<distro>kde-linux</distro>
|
||||
<release-status>rolling</release-status>
|
||||
<firmware arch="x86_64" type="bios" supported="false"/>
|
||||
<firmware arch="x86_64" type="efi" supported="true"/>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
<vendor>KDE</vendor>
|
||||
<vendor_url>https://kde.org</vendor_url>
|
||||
|
||||
<action id="org.kde.os.calamares.pkexec.run">
|
||||
<action id="org.kde.linux.calamares.pkexec.run">
|
||||
<description>Run Installer</description>
|
||||
<message>Authentication is required to run the installation program</message>
|
||||
<icon_name>drive-harddisk</icon_name>
|
||||
@@ -6,7 +6,7 @@ set -ex
|
||||
|
||||
env
|
||||
|
||||
mkdir --mode 0700 /system # for the kdeos-overlay.service
|
||||
mkdir --mode 0700 /system # for the kde-linux-overlay.service
|
||||
mkdir /snap # for snapd (will get a subvolume mounted into that snapd then mounts the snaps into)
|
||||
|
||||
export SYSTEMD_ESP_PATH="$BOOT_MNT"
|
||||
@@ -83,7 +83,7 @@ packages=(
|
||||
# kde-builder dependencies
|
||||
dbus-python python-yaml python-setproctitle
|
||||
|
||||
# for _kdeos-make-debug-archive
|
||||
# for _kde-linux-make-debug-archive
|
||||
arch-install-scripts
|
||||
)
|
||||
|
||||
@@ -132,7 +132,7 @@ EOF
|
||||
cat <<- EOF > /usr/lib/os-release
|
||||
NAME="KDE Linux"
|
||||
PRETTY_NAME="KDE Linux"
|
||||
ID=kdelinux
|
||||
ID=kde-linux
|
||||
VERSION_ID=$IMAGE_VERSION
|
||||
BUILD_ID=$CI_COMMIT_SHORT_SHA
|
||||
ANSI_COLOR="38;2;61;174;233"
|
||||
@@ -153,7 +153,7 @@ cat /usr/lib/os-release
|
||||
|
||||
# Generate the debug archive after the os-release so we can easily turn it into a systemd-sysext
|
||||
cd /
|
||||
_kdeos-make-debug-archive
|
||||
_kde-linux-make-debug-archive
|
||||
|
||||
mkdir flatpak
|
||||
flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
@@ -192,5 +192,5 @@ EOF
|
||||
plymouth-set-default-theme breeze-bgrt
|
||||
|
||||
cd /tmp
|
||||
/usr/bin/_kdeos-rebuild-efi
|
||||
/usr/bin/_kde-linux-rebuild-efi
|
||||
mv -v ./*.efi /
|
||||
|
||||
Reference in New Issue
Block a user