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 paths

Browse source
This commit is contained in:
Jason N. 2024-03-30 11:02:26 -04:00
parent ef96bb1adb
commit 9eb5256c3b
6 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -109,7 +109,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 _SUBDIRS = container external flatpak_refs lorax_templates repos xorriso test
# Step 7: Build end ISO # Step 7: Build end ISO
## Default action ## Default action
@ -149,11 +149,11 @@ clean:
.PHONY: install-deps .PHONY: install-deps
install-deps: install-deps:
$(install_pkg) lorax xorriso coreutils gettext $(install_pkg) lorax xorriso coreutils gettext
$(foreach DIR,$(_SUBDIRS),$(MAKE) -w -C $(DIR) install-deps;) $(foreach DIR,$(filter-out test,$(_SUBDIRS)),$(MAKE) -w -C $(DIR) install-deps;)
.PHONY: $(_SUBDIRS) test $(wildcard test/*) $(wildcard test/*/*) .PHONY: $(_SUBDIRS) $(wildcard test/*) $(wildcard test/*/*)
test $(addsuffix /*,$(_SUBDIRS) test): test $(addsuffix /*,$(_SUBDIRS)):
$(eval DIR=$(firstword $(subst /, ,$@))) $(eval DIR=$(firstword $(subst /, ,$@)))
$(if $(filter-out $(DIR),$@), $(eval TARGET=$(subst $(DIR)/,,$@)),$(eval TARGET=)) $(if $(filter-out $(DIR),$@), $(eval TARGET=$(subst $(DIR)/,,$@)),$(eval TARGET=))
$(MAKE) -w -C $(DIR) $(TARGET) $(MAKE) -w -C $(DIR) $(TARGET)

3
test/Makefile
View file

@ -17,4 +17,7 @@ $(filter-out README.md Makefile,$(wildcard */*)):
install-deps: install-deps:
$(foreach DIR,$(filter-out README.md Makefile,$(wildcard *)),$(MAKE) -w -C $(DIR) install-deps;) $(foreach DIR,$(filter-out README.md Makefile,$(wildcard *)),$(MAKE) -w -C $(DIR) install-deps;)
clean:
$(foreach DIR,$(filter-out README.md Makefile,$(wildcard *)),$(MAKE) -w -C $(DIR) clean;)
.PHONY: all $(filter-out README.md Makefile,$(wildcard *)) $(filter-out README.md Makefile,$(wildcard */*)) .PHONY: all $(filter-out README.md Makefile,$(wildcard *)) $(filter-out README.md Makefile,$(wildcard */*))

34
test/iso/Makefile
View file

@ -1,31 +1,25 @@
ISO_NAME=deploy.iso ISO_NAME=deploy.iso
ISO_TESTS=$(filter-out README.md Makefile,$(wildcard *))) ISO_TESTS=$(wildcard install_*) $(if $(FLATPAK_REMOTE_REFS) $(FLATPAK_DIR),$(wildcard flatpak_*))
all: $(ISO_TESTS) all: $(ISO_TESTS) clean
$(ISO_TESTS): $(ISO_TESTS): /mnt/iso
$(eval _VARS = ISO_NAME VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
chmod +x $@ chmod +x $@
ISO=../../$(ISO_NAME) ./$@ $(foreach var,$(_VARS),$(var)=$($(var))) ./$@
prep:
$(eval _VARS = VERSION FLATPAK_REMOTE_NAME _FLATPAK_REPO_URL)
mnt/iso:
sudo modprobe loop sudo modprobe loop
sudo mkdir /mnt/iso /mnt/install sudo mkdir mnt/iso mnt/install
sudo mount -o loop deploy.iso /mnt/iso sudo mount -o loop ../../$(ISO_NAME) 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
# install tests clean:
$(call run_tests,iso,install) sudo umount /mnt/install || true
sudo umount /mnt/iso || true
# flapak tests sudo rmdir /mnt/install /mnt/iso
if [ -n "$(FLATPAK_REMOTE_REFS)" ]; then $(call run_tests,iso,flatpak); fi
# Cleanup
sudo umount /mnt/install
sudo umount /mnt/iso
install-deps: install-deps:
$(install_pkg) isomd5sum coreutils squashfs-tools $(install_pkg) isomd5sum coreutils squashfs-tools
.PHONY: all $(ISO_TESTS) .PHONY: all $(ISO_TESTS) clean

4
test/iso/flatpak_repo_updated.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
add_line=$(grep flatpak_manager.add_remote /mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py) add_line=$(grep flatpak_manager.add_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
add_line_repo=$(echo ${add_line} | grep ${FLATPAK_REMOTE_NAME}) add_line_repo=$(echo ${add_line} | grep ${FLATPAK_REMOTE_NAME})
add_line_url=$(echo ${add_line} | grep ${_FLATPAK_REPO_URL}) add_line_url=$(echo ${add_line} | grep ${_FLATPAK_REPO_URL})
@ -22,7 +22,7 @@ else
echo "Repo url found on add_remote line" echo "Repo url found on add_remote line"
fi fi
replace_line=$(grep flatpak_manager.replace_installed_refs_remote /mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py) replace_line=$(grep flatpak_manager.replace_installed_refs_remote mnt/install/usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py)
replace_line_repo=$(echo ${replace_line} | grep ${FLATPAK_REMOTE_NAME}) replace_line_repo=$(echo ${replace_line} | grep ${FLATPAK_REMOTE_NAME})

4
test/iso/install_hash.sh
View file

@ -2,5 +2,5 @@
set -ex set -ex
checkisomd5 ${ISO} checkisomd5 ../../${ISO_NAME}
cd $(dirname ${ISO}) && sha256sum -c $(basename ${ISO})-CHECKSUM cd $(dirname ../../${ISO_NAME}) && sha256sum -c $(basename ${ISO_NAME})-CHECKSUM

2
test/iso/install_os-release.sh
View file

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
FOUND_VERSION=$(cat /mnt/install/etc/os-release | grep VERSION_ID | cut -d= -f2) FOUND_VERSION=$(cat mnt/install/etc/os-release | grep VERSION_ID | cut -d= -f2)
if [[ ${FOUND_VERSION} != ${VERSION} ]] if [[ ${FOUND_VERSION} != ${VERSION} ]]
then then