From: hayao Date: Sat, 22 Feb 2020 04:58:53 +0000 (+0900) Subject: [update] : Added cf kernel support. X-Git-Tag: 20Q1.2.0~35^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5848dff043531cfe866fa8d2264a3e878e9f3ce;p=alterlinux%2Falterlinux.git [update] : Added cf kernel support. --- diff --git a/airootfs/usr/share/calamares/modules/initcpio/initcpio-ck.conf b/airootfs/usr/share/calamares/modules/initcpio/initcpio-ck.conf new file mode 100644 index 00000000..92a25b77 --- /dev/null +++ b/airootfs/usr/share/calamares/modules/initcpio/initcpio-ck.conf @@ -0,0 +1,23 @@ +# Run mkinitcpio(8) with the given preset value +--- +# This key defines the kernel to be loaded. +# It can have the following values: +# - empty or unset, interpreted as "all" +# - the literal string "$uname" (without quotes, with dollar), +# which will use the output of `uname -r` to determine the +# running kernel, and use that. +# - any other string. +# +# Whatever is set, that string is passed as *preset* argument to the +# `-p` option of *mkinitcpio*. Take care that both "$uname" operates +# in the host system, and might not be correct if the target system is +# updated (to a newer kernel) as part of the installation. +# +# Note that "all" is probably not a good preset to use either. +# kernel: linux312 +kernel: linux-ck + +# Set this to true to turn off mitigations for lax file +# permissions on initramfs (which, in turn, can compromise +# your LUKS encryption keys, CVS-2019-13179). +be_unsafe: false diff --git a/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf b/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf new file mode 100644 index 00000000..6c4a4990 --- /dev/null +++ b/airootfs/usr/share/calamares/modules/unpackfs/unpackfs-ck.conf @@ -0,0 +1,97 @@ +# Unsquash / unpack a filesystem. Multiple sources are supported, and +# they may be squashed or plain filesystems. +# +# Configuration: +# +# from globalstorage: rootMountPoint +# from job.configuration: the path to where to mount the source image(s) +# for copying an ordered list of unpack mappings for image file <-> +# target dir relative to rootMountPoint. + +--- +# Each list item is unpacked, in order, to the target system. +# +# Each list item has the following **mandatory** attributes: +# - *source* path relative to the live / intstalling system to the image +# - *sourcefs* the type of the source files; valid entries are +# - `ext4` (copies the filesystem contents) +# - `squashfs` (unsquashes) +# - `file` (copies a file or directory) +# - (may be others if mount supports it) +# - *destination* path relative to rootMountPoint (so in the target +# system) where this filesystem is unpacked. It may be an +# empty string, which effectively is / (the root) of the target +# system. +# +# Each list item **optionally** can include the following attributes: +# - *exclude* is a list of values that is expanded into --exclude +# arguments for rsync (each entry in exclude gets its own --exclude). +# - *excludeFile* is a single file that is passed to rsync as an +# --exclude-file argument. This should be a full pathname +# inside the **host** filesystem. +# +# EXAMPLES +# +# Usually you list a filesystem image to unpack; you can use +# squashfs or an ext4 image. An empty destination is equivalent to "/", +# the root of the target system. The destination directory must exist +# in the target system. +# +# - source: "/path/to/filesystem.sqfs" +# sourcefs: "squashfs" +# destination: "" +# +# Multiple entries are unpacked in-order; if there is more than one +# item then only the first must exist beforehand -- it's ok to +# create directories with one unsquash and then to use those +# directories as a target from a second unsquash. +# +# - source: "/path/to/another/filesystem.img" +# sourcefs: "ext4" +# destination: "" +# - source: "/path/to/another/filesystem2.img" +# sourcefs: "ext4" +# destination: "/usr/lib/extra" +# +# You can list filesystem source paths relative to the Calamares run +# directory, if you use -d (this is only useful for testing, though). +# +# - source: ./example.sqfs +# sourcefs: squashfs +# destination: "" +# +# You can list individual files (copied one-by-one), or directories +# (the files inside this directory are copied directly to the destination, +# so no "dummycpp/" subdirectory is created in this example). +# Do note that the target directory must exist already (e.g. from +# extracting some other filesystem). +# +# - source: ../CHANGES +# sourcefs: file +# destination: "/tmp/derp" +# - source: ../src/modules/dummycpp +# sourcefs: file +# destination: "/tmp/derp" +# +# The *destination* and *source* are handed off to rsync, so the semantics +# of trailing slashes apply. In order to *rename* a file as it is +# copied, specify one single file (e.g. CHANGES) and a full pathname +# for its destination name, as in the example below. + +#unpack: +# - source: ../CHANGES +# sourcefs: file +# destination: "/tmp/changes.txt" +# - source: src/qml/calamares/slideshow +# sourcefs: file +# destination: "/tmp/slideshow/" +# exclude: [ "*.qmlc", "qmldir" ] +# # excludeFile: /etc/calamares/modules/unpackfs/exclude-list.txt + +unpack: + - source: "/run/archiso/bootmnt/alter/x86_64/airootfs.sfs" + sourcefs: "squashfs" + destination: "" + - source: "/run/archiso/bootmnt/alter/boot/x86_64/vmlinuz-linux-ck" + sourcefs: "file" + destination: "/boot/vmlinuz-linux-ck" diff --git a/build.sh b/build.sh index 34041a4f..57368c32 100755 --- a/build.sh +++ b/build.sh @@ -383,6 +383,7 @@ while getopts 'w:o:g:p:c:t:hbk:' arg; do "lts") kernel=lts ;; "lqx") kernel=lqx ;; "zen") kernel=zen ;; + "ck") kernel=ck ;; *) echo "Invalid kernel ${OPTARG}" _usage 1 diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf new file mode 100644 index 00000000..def445b4 --- /dev/null +++ b/efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf @@ -0,0 +1,6 @@ +title Alter Linux archiso x86_64 UEFI CD +linux /EFI/archiso/vmlinuz-linux-ck.efi +initrd /EFI/archiso/intel_ucode.img +initrd /EFI/archiso/amd_ucode.img +initrd /EFI/archiso/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf new file mode 100644 index 00000000..ecb8463d --- /dev/null +++ b/efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf @@ -0,0 +1,6 @@ +title Alter Linux archiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-ck +initrd /%INSTALL_DIR%/boot/intel_ucode.img +initrd /%INSTALL_DIR%/boot/amd_ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/syslinux/archiso_pxe/archiso_pxe-ck.cfg b/syslinux/archiso_pxe/archiso_pxe-ck.cfg new file mode 100644 index 00000000..9c8eff69 --- /dev/null +++ b/syslinux/archiso_pxe/archiso_pxe-ck.cfg @@ -0,0 +1,36 @@ +INCLUDE boot/syslinux/archiso_head.cfg + +LABEL arch64_nbd +TEXT HELP +Boot the Alter Linux (x86_64) live medium (Using NBD). +It allows you to install Alter Linux or perform system maintenance. +ENDTEXT +MENU LABEL Boot Alter Linux (x86_64) (NBD) +LINUX boot/x86_64/vmlinuz-linux-ck +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} +SYSAPPEND 3 + +LABEL arch64_nfs +TEXT HELP +Boot the Alter Linux (x86_64) live medium (Using NFS). +It allows you to install Alter Linux or perform system maintenance. +ENDTEXT +MENU LABEL Boot Alter Linux (x86_64) (NFS) +LINUX boot/x86_64/vmlinuz-linux-ck +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt +SYSAPPEND 3 + +LABEL arch64_http +TEXT HELP +Boot the Alter Linux (x86_64) live medium (Using HTTP). +It allows you to install Alter Linux or perform system maintenance. +ENDTEXT +MENU LABEL Boot Alter Linux (x86_64) (HTTP) +LINUX boot/x86_64/vmlinuz-linux-ck +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ +SYSAPPEND 3 + +INCLUDE boot/syslinux/archiso_tail.cfg diff --git a/syslinux/archiso_sys/archiso_sys-ck.cfg b/syslinux/archiso_sys/archiso_sys-ck.cfg new file mode 100644 index 00000000..5ec813e4 --- /dev/null +++ b/syslinux/archiso_sys/archiso_sys-ck.cfg @@ -0,0 +1,13 @@ +INCLUDE boot/syslinux/archiso_head.cfg + +LABEL arch64 +TEXT HELP +Boot the Alter Linux (x86_64) live medium. +It allows you to install Alter Linux or perform system maintenance. +ENDTEXT +MENU LABEL Boot Alter Linux (x86_64) +LINUX boot/x86_64/vmlinuz-linux-ck +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% + +INCLUDE boot/syslinux/archiso_tail.cfg