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

paths

Browse source
This commit is contained in:
Jason N. 2024-04-02 22:33:03 -04:00
parent b1d2edfc3a
commit 08326b8a6a
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,5 +1,6 @@
/debugdata
/build
/flatpaks/script.sh
/lorax_templates/post_*
/pkglists
/repos/*.repo

2
Makefile
View file

@ -65,7 +65,7 @@ _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
else
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)))
export FLATPAK_REMOTE_REFS += $(sort $(COLLECTED_REFS))
endif

11
flatpaks/Makefile
View file

@ -1,10 +1,12 @@
IMAGE := $(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG)
FLATPAK_DIR := $(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD))
.PHONY: full_list
full_list: repo
cat list.txt >&2
cat $(FLATPAK_DIR)/list.txt >&2
repo: script.sh
$(eval IMAGE=$(IMAGE_REPO)/$(IMAGE_NAME):$(IMAGE_TAG))
$(eval FLATPAK_DIR=$(if $(GITHUB_WORKSPACE),$(shell mktemp -d -p $(GITHUB_WORKSPACE) flatpak.XXX),$(PWD)))
$(if $(GITHUB_WORKSPACE),cp script.sh $(FLATPAK_DIR)/)
docker run --rm --privileged --entrypoint bash -e FLATPAK_SYSTEM_DIR=/flatpak/flatpak -e FLATPAK_TRIGGERSDIR=/flatpak/triggers --volume $(FLATPAK_DIR):/flatpak_dir $(IMAGE) /flatpak_dir/script.sh
$(if $(GITHUB_OUTPUT),echo "flatpak_dir=$(FLATPAK_DIR)" >> $(GITHUB_OUTPUT))
@ -12,6 +14,7 @@ repo: script.sh
script.sh:
cat << EOF > script.sh
set -ex
mkdir -p /flatpak/flatpak /flatpak/triggers
mkdir /var/tmp || true
chmod -R 1777 /var/tmp
@ -23,7 +26,7 @@ script.sh:
do
echo "Copying \$${i}..."
ostree --repo=/flatpak_dir/repo pull-local \$${FLATPAK_SYSTEM_DIR}/repo \$$(ostree --repo=\$${FLATPAK_SYSTEM_DIR}/repo rev-parse $(FLATPAK_REMOTE_NAME)/\$${i})
mkdir -p \$(dirname /flatpak_dir/repo/refs/heads/\${i})
mkdir -p \$$(dirname /flatpak_dir/repo/refs/heads/\$${i})
ostree --repo=\$${FLATPAK_SYSTEM_DIR}/repo rev-parse $(FLATPAK_REMOTE_NAME)/\$${i} > /flatpak_dir/repo/refs/heads/\$${i}
done
flatpak build-update-repo /flatpak_dir/repo

8
xorriso/gen_input.sh
View file

@ -6,7 +6,7 @@ echo "-outdev ${ISO_NAME}"
echo "-boot_image any replay"
echo "-joliet on"
echo "-compliance joliet_long_names"
pushd "${PWD}/results" > /dev/null
pushd "${PWD}/../results" > /dev/null
#for file in $(find . -type f)
for file in ./boot/grub2/grub.cfg ./EFI/BOOT/grub.cfg
do
@ -14,14 +14,14 @@ do
then
continue
fi
echo "-map ${PWD}/results/${file} ${file:2}"
echo "-map ${PWD}/../results/${file} ${file:2}"
echo "-chmod 0444 ${file:2}"
done
popd > /dev/null
if [[ -n "../${FLATPAK_DIR}" ]]
if [[ -n "${FLATPAK_DIR}" ]]
then
pushd "../${FLATPAK_DIR}" > /dev/null
pushd "${FLATPAK_DIR}" > /dev/null
for file in $(find . -type f)
do
echo "-map ${PWD}/${file} flatpak/${file:2}"