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

don't override platform id

Browse source
This commit is contained in:
Jason N. 2024-03-12 13:08:11 -04:00
parent 29179de853
commit ef3d355b28
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/build-and-test.yml vendored
View file

@ -79,6 +79,7 @@ jobs:
outputs: outputs:
iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }} iso_name-38: ${{ steps.save_output.outputs.iso_name-38 }}
iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }} iso_name-39: ${{ steps.save_output.outputs.iso_name-39 }}
iso_name-40: ${{ steps.save_output.outputs.iso_name-40 }}
steps: steps:
- name: Checkout repo - name: Checkout repo
uses: actions/checkout@v4 uses: actions/checkout@v4

3
Makefile
View file

@ -170,8 +170,6 @@ repos/%.repo: /etc/yum.repos.d/%.repo
boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES) boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
rm -Rf $(_BASE_DIR)/results || true rm -Rf $(_BASE_DIR)/results || true
mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
cp /etc/os-release $(_TEMP_DIR)/os-release || true
sed -i 's/PLATFORM_ID=.*/PLATFORM_ID="$(_PLATFORM_ID)"/' /etc/os-release
# Download the secure boot key # Download the secure boot key
if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \ if [ -n "$(SECURE_BOOT_KEY_URL)" ]; \
@ -192,7 +190,6 @@ boot.iso: lorax_repo $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FIL
$(_BASE_DIR)/results/ $(_BASE_DIR)/results/
mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/ mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
mv -f $(_TEMP_DIR)/os-release /etc/os-release || true
# Step 4: Download container image # Step 4: Download container image
container/$(IMAGE_NAME)-$(IMAGE_TAG): container/$(IMAGE_NAME)-$(IMAGE_TAG):