actions/build-container-installer
1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00
Code Releases Activity

fix path

Browse source
This commit is contained in:
Jason N. 2024-04-02 13:41:42 -04:00
parent 6a110a0dc0
commit 8f24ba12db
4 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Makefile
View file

@ -3,10 +3,10 @@ include Makefile.inputs
################### ###################
# Hidden vars # Hidden vars
export SHELL = /bin/sh export SHELL := /bin/sh
# Cache # Cache
export DNF_CACHE = export DNF_CACHE :=
export PACKAGE_MANAGER = dnf export PACKAGE_MANAGER := dnf
# Functions # Functions
## Formatting = lowercase ## Formatting = lowercase
@ -24,20 +24,20 @@ export install_pkg
# Generated/internal vars # Generated/internal vars
## Formatting = _UPPERCASE ## Formatting = _UPPERCASE
export _BASE_DIR = $(shell pwd) export _BASE_DIR := $(shell pwd)
_IMAGE_REPO_ESCAPED = $(subst /,\/,$(IMAGE_REPO)) _IMAGE_REPO_ESCAPED := $(subst /,\/,$(IMAGE_REPO))
_IMAGE_REPO_DOUBLE_ESCAPED = $(subst \,\\\,$(_IMAGE_REPO_ESCAPED)) _IMAGE_REPO_DOUBLE_ESCAPED := $(subst \,\\\,$(_IMAGE_REPO_ESCAPED))
_LORAX_ARGS = _LORAX_ARGS :=
_LORAX_TEMPLATES = $(call get_templates,install) _LORAX_TEMPLATES := $(call get_templates,install)
_REPO_FILES = $(subst /etc/yum.repos.d,repos,$(REPOS)) _REPO_FILES := $(subst /etc/yum.repos.d,repos,$(REPOS))
_TEMP_DIR = $(shell mktemp -d) _TEMP_DIR := $(shell mktemp -d)
_TEMPLATE_VARS = ARCH _BASE_DIR IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI _TEMPLATE_VARS := ARCH _BASE_DIR IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS _RHEL VARIANT VERSION WEB_UI
_VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG) _VOLID := $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG)
ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo) ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
_RHEL = true _RHEL := true
else else
_RHEL = false _RHEL := false
endif endif
ifeq ($(_RHEL),true) ifeq ($(_RHEL),true)
@ -66,7 +66,7 @@ _LORAX_TEMPLATES += $(call get_templates,secureboot)
_TEMPLATE_VARS += ENROLLMENT_PASSWORD _TEMPLATE_VARS += ENROLLMENT_PASSWORD
endif endif
_SUBDIRS = container external flatpak_refs lorax_templates repos xorriso test _SUBDIRS := container external flatpak_refs lorax_templates repos xorriso test
# Create checksum # Create checksum
## Default action ## Default action
@ -103,7 +103,7 @@ results/images/boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templat
$(if $(wildcard $(_TEMP_DIR)/macros.image-language-conf),mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf) $(if $(wildcard $(_TEMP_DIR)/macros.image-language-conf),mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf)
FILES_TO_CLEAN = $(wildcard build debugdata pkglists results original-pkgsizes.txt final-pkgsizes.txt lorax.conf *.iso *log) FILES_TO_CLEAN := $(wildcard build debugdata pkglists results original-pkgsizes.txt final-pkgsizes.txt lorax.conf *.iso *log)
.PHONY: clean .PHONY: clean
clean: clean:
rm -Rf $(FILES_TO_CLEAN) rm -Rf $(FILES_TO_CLEAN)

10
Makefile.flatpak
View file

@ -1,18 +1,18 @@
ifneq ($(FLATPAK_DIR),) ifneq ($(FLATPAK_DIR),)
_FLATPAK_REPO_GPG = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2) _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
export _FLATPAK_REPO_URL = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2) export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
_LORAX_ARGS += -i flatpak-libs _LORAX_ARGS += -i flatpak-libs
_LORAX_TEMPLATES += $(call get_templates,flatpak) _LORAX_TEMPLATES += $(call get_templates,flatpak)
_TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL _TEMPLATE_VARS += FLATPAK_DIR FLATPAK_REMOTE_NAME FLATPAK_REMOTE_REFS FLATPAK_REMOTE_URL _FLATPAK_REPO_GPG _FLATPAK_REPO_URL
else else
ifneq ($(FLATPAK_REMOTE_REFS_DIR),) ifneq ($(FLATPAK_REMOTE_REFS_DIR),)
COLLECTED_REFS = $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file))) COLLECTED_REFS := $(foreach file,$(filter-out README.md Makefile,$(wildcard $(FLATPAK_REMOTE_REFS_DIR)/*)),$(shell cat $(file)))
FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS)) FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
endif endif
ifneq ($(FLATPAK_REMOTE_REFS),) ifneq ($(FLATPAK_REMOTE_REFS),)
_FLATPAK_REPO_GPG = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2) _FLATPAK_REPO_GPG := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
export _FLATPAK_REPO_URL = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2) export _FLATPAK_REPO_URL := $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
_LORAX_ARGS += -i flatpak-libs _LORAX_ARGS += -i flatpak-libs
_LORAX_TEMPLATES += $(call get_templates,flatpak) \ _LORAX_TEMPLATES += $(call get_templates,flatpak) \
external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl external/fedora-lorax-templates/ostree-based-installer/lorax-embed-flatpaks.tmpl

38
Makefile.inputs
View file

@ -1,24 +1,24 @@
# Configuration vars # Configuration vars
## Formatting = UPPERCASE ## Formatting = UPPERCASE
# General # General
export ADDITIONAL_TEMPLATES = export ADDITIONAL_TEMPLATES :=
export ARCH = x86_64 export ARCH := x86_64
export EXTRA_BOOT_PARAMS = export EXTRA_BOOT_PARAMS :=
export IMAGE_NAME = base export IMAGE_NAME := base
export IMAGE_REPO = quay.io/fedora-ostree-desktops export IMAGE_REPO := quay.io/fedora-ostree-desktops
export IMAGE_TAG = $(VERSION) export IMAGE_TAG = $(VERSION)
REPOS = $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo)) REPOS := $(subst :,\:,$(wildcard /etc/yum.repos.d/*.repo))
export ROOTFS_SIZE = 4 export ROOTFS_SIZE := 4
export VARIANT = Server export VARIANT := Server
export VERSION = 39 export VERSION := 39
export WEB_UI = false export WEB_UI := false
# Flatpak # Flatpak
export FLATPAK_REMOTE_NAME = flathub export FLATPAK_REMOTE_NAME := flathub
export FLATPAK_REMOTE_URL = https://flathub.org/repo/flathub.flatpakrepo export FLATPAK_REMOTE_URL := https://flathub.org/repo/flathub.flatpakrepo
export FLATPAK_REMOTE_REFS = export FLATPAK_REMOTE_REFS :=
export FLATPAK_REMOTE_REFS_DIR = export FLATPAK_REMOTE_REFS_DIR :=
export FLATPAK_DIR = export FLATPAK_DIR :=
# Secure boot # Secure boot
export ENROLLMENT_PASSWORD = export ENROLLMENT_PASSWORD :=
export SECURE_BOOT_KEY_URL = export SECURE_BOOT_KEY_URL :=
export ISO_NAME = build/deploy.iso export ISO_NAME := build/deploy.iso

6
test/iso/Makefile
View file

@ -15,9 +15,9 @@ mnt/iso:
sudo mount -t squashfs -o loop mnt/iso/images/install.img mnt/install sudo mount -t squashfs -o loop mnt/iso/images/install.img mnt/install
clean: clean:
sudo umount /mnt/install || true sudo umount mnt/install || true
sudo umount /mnt/iso || true sudo umount mnt/iso || true
sudo rmdir /mnt/install /mnt/iso sudo rmdir mnt/install /mnt/iso
install-deps: install-deps:
$(install_pkg) isomd5sum coreutils squashfs-tools curl $(install_pkg) isomd5sum coreutils squashfs-tools curl