Commit 350ef6c8 authored by Louis Abel's avatar Louis Abel 📺
Browse files

Merge branch 'devel' into 'main'

fix up some things

See merge request !40
parents ba6e9911 7903b524
Pipeline #119 passed with stage
in 30 seconds
...@@ -63,6 +63,13 @@ MODS=( ...@@ -63,6 +63,13 @@ MODS=(
# functions # functions
# Note, EL8 and EL9 may not be the same, do not put in 'common' # Note, EL8 and EL9 may not be the same, do not put in 'common'
function treeinfoSaver() {
BaseOSArch="${1}"
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
PRISTINE_TREE="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo-pristine"
/bin/cp "${TREEINFO_VAR}" "${PRISTINE_TREE}"
}
function treeinfoFixer() { function treeinfoFixer() {
BaseOSArch="${1}" BaseOSArch="${1}"
TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo" TREEINFO_VAR="${STAGING_ROOT}/${RELEASE_DIR}/BaseOS/${BaseOSArch}/os/.treeinfo"
...@@ -134,7 +141,6 @@ from configparser import ConfigParser ...@@ -134,7 +141,6 @@ from configparser import ConfigParser
config = ConfigParser() config = ConfigParser()
config.read('${TREEINFO_VAR}') config.read('${TREEINFO_VAR}')
config.set('tree', 'variants', 'BaseOS,AppStream') config.set('tree', 'variants', 'BaseOS,AppStream')
config.add_section('variant-AppStream')
config.set('variant-AppStream', 'id', 'AppStream') config.set('variant-AppStream', 'id', 'AppStream')
config.set('variant-AppStream', 'name', 'AppStream') config.set('variant-AppStream', 'name', 'AppStream')
config.set('variant-AppStream', 'type', 'variant') config.set('variant-AppStream', 'type', 'variant')
......
...@@ -87,6 +87,7 @@ for ARCH in "${ARCHES[@]}"; do ...@@ -87,6 +87,7 @@ for ARCH in "${ARCHES[@]}"; do
echo "Ensuring treeinfo is correct" echo "Ensuring treeinfo is correct"
treeinfoModder "${ARCH}" treeinfoModder "${ARCH}"
treeinfoModderKickstart "${ARCH}" treeinfoModderKickstart "${ARCH}"
treeinfoSaver "${ARCH}"
done done
# sign all repos # sign all repos
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment