Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/archiso/mkarchiso b/archiso/mkarchiso
- index 8f59a71..43376d1 100755
- --- a/archiso/mkarchiso
- +++ b/archiso/mkarchiso
- @@ -510,8 +510,9 @@ _make_boot_on_fat() {
- _msg_info "Preparing kernel and initramfs for the FAT file system..."
- mmd -i "${efibootimg}" \
- "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
- - mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinuz-"* \
- + mcopy -i "${efibootimg}" "${pacstrap_dir}/boot/vmlinux"* \
- "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
- + mcopy -i "${work_dir}/efiboot.img" "${pacstrap_dir}/boot/sc8280xp-lenovo-thinkpad-x13s.dtb" "::/${install_dir}/boot/${arch}/"
- if (( need_external_ucodes )); then
- for ucode_image in "${ucodes[@]}"; do
- if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
- @@ -851,8 +852,9 @@ _make_bootmode_uefi.systemd-boot() {
- efiboot_files+=("${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-boot${uefi_arch[$arch],,}.efi"
- "${pacstrap_dir}/usr/share/edk2-shell/${uefi_arch[$arch],,}/Shell_Full.efi"
- "${work_dir}/loader/"
- - "${pacstrap_dir}/boot/vmlinuz-"*
- + "${pacstrap_dir}/boot/vmlinux"*
- "${pacstrap_dir}/boot/initramfs-"*".img"
- + "${pacstrap_dir}/boot/sc8280xp-lenovo-thinkpad-x13s.dtb"
- "${_available_ucodes[@]}")
- # Files specific to x86_64: IA32 UEFI binaries for mixed mode booting, memtest86+
- diff --git a/configs/releng/airootfs/etc/mkinitcpio.conf b/configs/releng/airootfs/etc/mkinitcpio.conf
- new file mode 100644
- index 0000000..0499dcb
- --- /dev/null
- +++ b/configs/releng/airootfs/etc/mkinitcpio.conf
- @@ -0,0 +1,91 @@
- +# vim:set ft=sh
- +# MODULES
- +# The following modules are loaded before any boot hooks are
- +# run. Advanced users may wish to specify all system modules
- +# in this array. For instance:
- +# MODULES=(piix ide_disk reiserfs)
- +MODULES=(nvme
- + phy_qcom_qmp_pcie
- + pcie_qcom
- + i2c_hid_of
- + i2c_qcom_geni
- + leds_qcom_lpg
- + pwm_bl
- + qrtr
- + pmic_glink_altmode
- + gpio_sbu_mux
- + phy_qcom_qmp_combo
- + gpucc_sc8280xp
- + dispcc_sc8280xp
- + panel_edp
- + msm
- + phy_qcom_edp
- + qcom_q6v5_pas
- +)
- +
- +# BINARIES
- +# This setting includes any additional binaries a given user may
- +# wish into the CPIO image. This is run last, so it may be used to
- +# override the actual binaries included by a given hook
- +# BINARIES are dependency parsed, so you may safely ignore libraries
- +BINARIES=()
- +
- +# FILES
- +# This setting is similar to BINARIES above, however, files are added
- +# as-is and are not parsed in any way. This is useful for config files.
- +FILES=("/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn"
- + "/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn"
- + "/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn"
- + "/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn"
- + "/lib/firmware/qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn"
- + "/lib/firmware/qcom/a660_sqe.fw"
- + "/lib/firmware/qcom/a660_gmu.bin"
- +)
- +
- +# HOOKS
- +# This is the most important setting in this file. The HOOKS control the
- +# modules and scripts added to the image, and what happens at boot time.
- +# Order is important, and it is recommended that you do not change the
- +# order in which HOOKS are added. Run 'mkinitcpio -H <hook name>' for
- +# help on a given hook.
- +# 'base' is _required_ unless you know precisely what you are doing.
- +# 'udev' is _required_ in order to automatically load modules
- +# 'filesystems' is _required_ unless you specify your fs modules in MODULES
- +# Examples:
- +## This setup specifies all modules in the MODULES setting above.
- +## No raid, lvm2, or encrypted root is needed.
- +# HOOKS=(base)
- +#
- +## This setup will autodetect all modules for your system and should
- +## work as a sane default
- +# HOOKS=(base udev autodetect block filesystems)
- +#
- +## This setup will generate a 'full' image which supports most systems.
- +## No autodetection is done.
- +# HOOKS=(base udev block filesystems)
- +#
- +## This setup assembles a pata mdadm array with an encrypted root FS.
- +## Note: See 'mkinitcpio -H mdadm' for more information on raid devices.
- +# HOOKS=(base udev block mdadm encrypt filesystems)
- +#
- +## This setup loads an lvm2 volume group on a usb device.
- +# HOOKS=(base udev block lvm2 filesystems)
- +#
- +## NOTE: If you have /usr on a separate partition, you MUST include the
- +# usr, fsck and shutdown hooks.
- +HOOKS=(base udev modconf archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
- +
- +# COMPRESSION
- +# Use this to compress the initramfs image. By default, gzip compression
- +# is used. Use 'cat' to create an uncompressed image.
- +#COMPRESSION="gzip"
- +#COMPRESSION="bzip2"
- +#COMPRESSION="lzma"
- +#COMPRESSION="xz"
- +#COMPRESSION="lzop"
- +#COMPRESSION="lz4"
- +#COMPRESSION="zstd"
- +
- +# COMPRESSION_OPTIONS
- +# Additional options for the compressor
- +#COMPRESSION_OPTIONS=()
- diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux-x13s.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux-x13s.preset
- new file mode 100644
- index 0000000..d84069e
- --- /dev/null
- +++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux-x13s.preset
- @@ -0,0 +1,8 @@
- +# mkinitcpio preset file for the 'linux-x13s' package on archiso
- +
- +PRESETS=('archiso')
- +
- +ALL_kver='/boot/vmlinux'
- +ALL_config='/etc/mkinitcpio.conf'
- +
- +archiso_image="/boot/initramfs-linux.img"
- diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
- deleted file mode 100644
- index 8e85205..0000000
- --- a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
- +++ /dev/null
- @@ -1,8 +0,0 @@
- -# mkinitcpio preset file for the 'linux' package on archiso
- -
- -PRESETS=('archiso')
- -
- -ALL_kver='/boot/vmlinuz-linux'
- -archiso_config='/etc/mkinitcpio.conf.d/archiso.conf'
- -
- -archiso_image="/boot/initramfs-linux.img"
- diff --git a/configs/releng/efiboot/loader/entries/01-archiso-linux.conf b/configs/releng/efiboot/loader/entries/01-archiso-linux.conf
- index c35f663..1259003 100644
- --- a/configs/releng/efiboot/loader/entries/01-archiso-linux.conf
- +++ b/configs/releng/efiboot/loader/entries/01-archiso-linux.conf
- @@ -1,5 +1,5 @@
- title Arch Linux install medium (%ARCH%, UEFI)
- sort-key 01
- -linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
- +linux /%INSTALL_DIR%/boot/%ARCH%/vmlinux
- initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
- -options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID%
- +options dtb=/%INSTALL_DIR%/boot/aarch64/sc8280xp-lenovo-thinkpad-x13s.dtb archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% efi=noruntime pd_ignore_unused clk_ignore_unused arm64.nopauth
- diff --git a/configs/releng/packages.aarch64 b/configs/releng/packages.aarch64
- new file mode 100644
- index 0000000..eae0cce
- --- /dev/null
- +++ b/configs/releng/packages.aarch64
- @@ -0,0 +1,121 @@
- +# TODO: might need archlinuxarm-keyring and archlinux-keyring (note that archlinux-keyring has never existed in the x86_64 iso installer)
- +alsa-utils
- +amd-ucode
- +arch-install-scripts
- +archinstall
- +archlinuxarm-keyring
- +base
- +bind-tools
- +brltty
- +#broadcom-wl
- +btrfs-progs
- +clonezilla
- +#cloud-init
- +crda
- +cryptsetup
- +darkhttpd
- +ddrescue
- +dhclient
- +dhcpcd
- +diffutils
- +dmraid
- +dnsmasq
- +dosfstools
- +e2fsprogs
- +#edk2-shell
- +efibootmgr
- +erofs-utils
- +espeakup
- +ethtool
- +exfatprogs
- +f2fs-tools
- +fatresize
- +fsarchiver
- +gnu-netcat
- +gpart
- +gpm
- +gptfdisk
- +grml-zsh-config
- +hdparm
- +#intel-ucode
- +#ipw2100-fw
- +#ipw2200-fw
- +irssi
- +iw
- +iwd
- +jfsutils
- +kitty-terminfo
- +less
- +lftp
- +libfido2
- +libusb-compat
- +linux-atm
- +linux-firmware
- +linux-firmware-qcom
- +livecd-sounds
- +lsscsi
- +lvm2
- +lynx
- +man-db
- +man-pages
- +mc
- +mdadm
- +#memtest86+
- +mkinitcpio
- +mkinitcpio-archiso
- +mkinitcpio-nfs-utils
- +modemmanager
- +mtools
- +nano
- +nbd
- +ndisc6
- +nfs-utils
- +nilfs-utils
- +nmap
- +ntfs-3g
- +nvme-cli
- +openconnect
- +openssh
- +openvpn
- +partclone
- +parted
- +partimage
- +pcsclite
- +ppp
- +pptpclient
- +pv
- +qemu-guest-agent
- +#reflector
- +#rp-pppoe
- +rsync
- +rxvt-unicode-terminfo
- +screen
- +sdparm
- +sg3_utils
- +smartmontools
- +squashfs-tools
- +sudo
- +#syslinux
- +systemd-resolvconf
- +tcpdump
- +terminus-font
- +testdisk
- +tmux
- +tpm2-tss
- +udftools
- +usb_modeswitch
- +usbmuxd
- +usbutils
- +vim
- +#virtualbox-guest-utils-nox
- +vpnc
- +wireless-regdb
- +wireless_tools
- +wpa_supplicant
- +wvdial
- +xfsprogs
- +xl2tpd
- +zsh
- +
- +# Custom Packages go here
- +linux-x13s
- diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf
- index e7e6497..a3dab07 100644
- --- a/configs/releng/pacman.conf
- +++ b/configs/releng/pacman.conf
- @@ -84,6 +84,15 @@ Include = /etc/pacman.d/mirrorlist
- [extra]
- Include = /etc/pacman.d/mirrorlist
- +[alarm]
- +Include = /etc/pacman.d/mirrorlist
- +
- +[aur]
- +Include = /etc/pacman.d/mirrorlist
- +
- +[ironrobin-x13s]
- +Server = https://github.com/ironrobin/x13s-alarm/releases/download/packages
- +
- # If you want to run 32 bit applications on your x86_64 system,
- # enable the multilib repositories as required here.
- diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
- index 7bd3040..d284b80 100644
- --- a/configs/releng/profiledef.sh
- +++ b/configs/releng/profiledef.sh
- @@ -8,9 +8,8 @@ iso_application="Arch Linux Live/Rescue DVD"
- iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
- install_dir="arch"
- buildmodes=('iso')
- -bootmodes=('bios.syslinux'
- - 'uefi.systemd-boot')
- -arch="x86_64"
- +bootmodes=('uefi.systemd-boot')
- +arch='aarch64'
- pacman_conf="pacman.conf"
- airootfs_image_type="squashfs"
- airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
Advertisement
Add Comment
Please, Sign In to add comment