QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

template flavor support (#828)

Browse Source 
Set TEMPLATE_FLAVOR variable to select template to build. That type will
be appended to template name.
Actual configuration can vary on template distribution, but generally
config files with suffix "_${TEMPLATE_FLAVOR}" will be used.
This commit is contained in:
Marek Marczykowski-Górecki 2014-05-13 04:40:09 +02:00
parent 26663e2a58
commit a77a635016
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -4,6 +4,9 @@ endif
#TODO: build template name somehow smarter #TODO: build template name somehow smarter
TEMPLATE_NAME := $${DIST/fc/fedora-}-x64 TEMPLATE_NAME := $${DIST/fc/fedora-}-x64
ifdef TEMPLATE_FLAVOR
TEMPLATE_NAME := $(TEMPLATE_NAME)-$(TEMPLATE_FLAVOR)
endif
VERSION := $(shell cat version) VERSION := $(shell cat version)
TIMESTAMP := $(shell date -u +%Y%m%d%H%M) TIMESTAMP := $(shell date -u +%Y%m%d%H%M)

4
qubeize_image
View File

@ -67,7 +67,9 @@ echo "--> Creating the Apps Menu templates..."
echo "--> Choosing appmenus whitelists..." echo "--> Choosing appmenus whitelists..."
rm -f appmenus rm -f appmenus
if [ -d "appmenus_$DIST" ]; then if [ -d "appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then
ln -s "appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus
elif [ -d "appmenus_$DIST" ]; then
ln -s "appmenus_$DIST" appmenus ln -s "appmenus_$DIST" appmenus
else else
ln -s "appmenus_generic" appmenus ln -s "appmenus_generic" appmenus

15
scripts_fedora/02_install_groups.sh
View File

@ -1,12 +1,19 @@
#!/bin/sh #!/bin/sh
echo "--> Preparing environment..." if [ -n "${TEMPLATE_FLAVOR}" ]; then
mount -t proc proc mnt/proc PKGLISTFILE="$SCRIPTSDIR/packages_${DIST}_${TEMPLATE_FLAVOR}.list"
if ! [ -r "${PKGLISTFILE}" ]; then
if [ -r "$SCRIPTSDIR/packages_${DIST}.list" ]; then echo "ERROR: ${PKGLISTFILE} does not exists!"
exit 1
fi
elif [ -r "$SCRIPTSDIR/packages_${DIST}.list" ]; then
PKGLISTFILE="$SCRIPTSDIR/packages_${DIST}.list" PKGLISTFILE="$SCRIPTSDIR/packages_${DIST}.list"
else else
PKGLISTFILE="$SCRIPTSDIR/packages.list" PKGLISTFILE="$SCRIPTSDIR/packages.list"
fi fi
echo "--> Preparing environment..."
mount -t proc proc mnt/proc
export PKGGROUPS=$(cat $PKGLISTFILE) export PKGGROUPS=$(cat $PKGLISTFILE)
export YUM0=$PWD/yum_repo_qubes export YUM0=$PWD/yum_repo_qubes