diff options
author | David P <megver83@parabola.nu> | 2021-08-02 19:01:09 -0400 |
---|---|---|
committer | David P <megver83@parabola.nu> | 2021-08-02 19:03:44 -0400 |
commit | f95bbcacb4525f5ebe4627dbd75df7bb915010d1 (patch) | |
tree | c4332029091ad58ce250730d7ea5ba6cbc94cadd | |
parent | 8b185792cce1c515d985e327741660207dd5a110 (diff) |
mkparabolaiso: remove _available_ucodes referencesv57
this is a "oops" when copy-pasting archiso code, plus, for some reason,
Makefile and README.rst were not completely synced in the last commit ¯\_(ツ)_/¯
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r-- | Makefile | 66 | ||||
-rw-r--r-- | README.rst | 16 | ||||
-rwxr-xr-x | parabolaiso/mkparabolaiso | 2 |
3 files changed, 22 insertions, 62 deletions
@@ -1,65 +1,33 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -INSTALL_FILES=$(wildcard parabolaiso/initcpio/install/*) -HOOKS_FILES=$(wildcard parabolaiso/initcpio/hooks/*) -SCRIPT_FILES=$(wildcard parabolaiso/initcpio/script/*) - -INSTALL_DIR=$(DESTDIR)/usr/lib/initcpio/install -HOOKS_DIR=$(DESTDIR)/usr/lib/initcpio/hooks -SCRIPT_DIR=$(DESTDIR)/usr/lib/initcpio +PREFIX ?= /usr/local +BIN_DIR=$(DESTDIR)$(PREFIX)/bin +DOC_DIR=$(DESTDIR)$(PREFIX)/share/doc/parabolaiso +PROFILE_DIR=$(DESTDIR)$(PREFIX)/share/parabolaiso DOC_FILES=$(wildcard docs/*) $(wildcard *.rst) - -DOC_DIR=$(DESTDIR)/usr/share/doc/parabolaiso - +SCRIPT_FILES=$(wildcard parabolaiso/*) $(wildcard scripts/*.sh) \ + $(wildcard configs/*/profiledef.sh) $(wildcard configs/*/airootfs/usr/local/bin/*) all: -check: lint - -lint: - shellcheck -s bash parabolaiso/mkparabolaiso \ - $(wildcard scripts/*.sh) \ - $(INSTALL_FILES) \ - $(wildcard configs/*/build.sh) \ - $(wildcard configs/*/profiledef.sh) \ - configs/releng/airootfs/root/.automated_script.sh \ - configs/releng/airootfs/usr/local/bin/choose-mirror \ - configs/releng/airootfs/usr/local/bin/livecd-sound \ - configs/releng-openrc/airootfs/root/.automated_script.sh \ - configs/releng-openrc/airootfs/etc/local.d/pacman-init.start \ - configs/releng-openrc/airootfs/etc/local.d/choose-mirror.start \ - configs/releng-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start \ - configs/releng-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector \ - configs/releng-openrc/airootfs/usr/local/bin/choose-mirror \ - configs/lxde-openrc/airootfs/root/.automated_script.sh \ - configs/lxde-openrc/airootfs/root/.keymap.sh \ - configs/lxde-openrc/airootfs/root/.language.sh \ - configs/lxde-openrc/airootfs/etc/local.d/pacman-init.start \ - configs/lxde-openrc/airootfs/etc/local.d/choose-mirror.start \ - configs/lxde-openrc/airootfs/etc/local.d/etc-pacman.d-gnupg.start \ - configs/lxde-openrc/airootfs/etc/NetworkManager/dispatcher.d/reflector \ - configs/lxde-openrc/airootfs/usr/local/bin/choose-mirror - shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES) +check: shellcheck -install: install-program install-examples install-doc +shellcheck: + shellcheck -s bash $(SCRIPT_FILES) -install-program: - install -vDm 755 parabolaiso/mkparabolaiso -t "$(DESTDIR)/usr/bin/" - install -vDm 755 scripts/run_parabolaiso.sh "$(DESTDIR)/usr/bin/run_parabolaiso" +install: install-scripts install-profiles install-doc -install-initcpio: - install -d $(SCRIPT_DIR) $(HOOKS_DIR) $(INSTALL_DIR) - install -m 755 -t $(SCRIPT_DIR) $(SCRIPT_FILES) - install -m 644 -t $(HOOKS_DIR) $(HOOKS_FILES) - install -m 644 -t $(INSTALL_DIR) $(INSTALL_FILES) +install-scripts: + install -vDm 755 parabolaiso/mkparabolaiso -t "$(BIN_DIR)/" + install -vDm 755 scripts/run_parabolaiso.sh "$(BIN_DIR)/run_parabolaiso" -install-examples: - install -d -m 755 $(DESTDIR)/usr/share/parabolaiso/ - cp -a --no-preserve=ownership configs $(DESTDIR)/usr/share/parabolaiso/ +install-profiles: + install -d -m 755 $(PROFILE_DIR) + cp -a --no-preserve=ownership configs $(PROFILE_DIR)/ install-doc: install -vDm 644 $(DOC_FILES) -t $(DOC_DIR) -.PHONY: check install install-program install-initcpio install-examples install-doc lint +.PHONY: check install install-doc install-profiles install-scripts shellcheck @@ -121,23 +121,17 @@ To install parabolaiso system-wide use the included ``Makefile``: make install -Optionally install parabolaiso's mkinitcpio hooks: - -.. code:: sh - - make install-initcpio - Optional features The iso image contains a GRUB environment block holding the iso name and version. This allows to boot the iso image from GRUB with a version specific cow directory to mitigate overlay clashes. .. code:: sh - loopback loop parabola.iso - load_env -f (loop)/parabola/grubenv - linux (loop)/parabola/boot/x86_64/vmlinuz-linux-libre ... \ - cow_directory=parabola/${VERSION} ... - initrd (loop)/parabola/boot/x86_64/initramfs-linux-libre-lts.img + loopback loop parabola.iso + load_env -f (loop)/parabola/grubenv + linux (loop)/parabola/boot/x86_64/vmlinuz-linux-libre ... \ + cow_directory=parabola/${VERSION} ... + initrd (loop)/parabola/boot/x86_64/initramfs-linux-libre-lts.img Contribute ========== diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index aaef80d..c39e6b9 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -530,7 +530,6 @@ _make_bootmode_uefi-x64.systemd-boot.esp() { "${profile}/efiboot/" \ "${pacstrap_dir}/boot/vmlinuz-"* \ "${pacstrap_dir}/boot/initramfs-"*".img" \ - "${_available_ucodes[@]}" \ 2>/dev/null | awk 'END { print $1 }')" # Create a FAT image for the EFI system partition _make_efibootimg "$efiboot_imgsize" @@ -574,7 +573,6 @@ _make_bootmode_uefi-x64.refind.esp() { "${profile}/efiboot/" \ "${pacstrap_dir}/boot/vmlinuz-"* \ "${pacstrap_dir}/boot/initramfs-"*".img" \ - "${_available_ucodes[@]}" \ 2>/dev/null | awk 'END { print $1 }')" # Create a FAT image for the EFI system partition _make_efibootimg "$efiboot_imgsize" |