|
|
|
@ -261,30 +261,6 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
|
|
|
|
|
OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# cribbed from cdimage, perhaps this should be a small helper script in germinate?
|
|
|
|
|
add_inheritance () {
|
|
|
|
|
case " $inherit " in
|
|
|
|
|
*" $1 "*)
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
inherit="${inherit:+$inherit }$1"
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
expand_inheritance () {
|
|
|
|
|
for seed in $(grep "^$1:" config/germinate-output/structure | cut -d: -f2); do
|
|
|
|
|
expand_inheritance "$seed"
|
|
|
|
|
done
|
|
|
|
|
add_inheritance "$1"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
inheritance () {
|
|
|
|
|
inherit=
|
|
|
|
|
expand_inheritance "$1"
|
|
|
|
|
echo "$inherit"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
mkdir -p config/germinate-output
|
|
|
|
|
case $PROJECT in
|
|
|
|
|
kubuntu-active*)
|
|
|
|
@ -723,23 +699,7 @@ if [ "${IMAGEFORMAT:-}" != live-layered ]; then
|
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
if [ -n "${BASE_SEED}" ]; then
|
|
|
|
|
SEEDS_EXPANDED=$(inheritance ${BASE_SEED})
|
|
|
|
|
for seed in ${SEEDS_EXPANDED}; do
|
|
|
|
|
echo "snap: considering ${seed}"
|
|
|
|
|
file=config/germinate-output/${seed}.snaps
|
|
|
|
|
[ -e "${file}" ] || continue
|
|
|
|
|
# extract the first column (snap package name) from germinate's output
|
|
|
|
|
# translate the human-readable "foo (classic)" into a
|
|
|
|
|
# more machine readable "foo/classic"
|
|
|
|
|
seed_snaps=$(sed -rn '1,/-----/d;/-----/,$d; s/(.*) \|.*/\1/; s, \(classic\),/classic,; p' "${file}")
|
|
|
|
|
for snap in ${seed_snaps}; do
|
|
|
|
|
echo "snap: found ${snap}"
|
|
|
|
|
ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}"
|
|
|
|
|
done
|
|
|
|
|
done
|
|
|
|
|
if [ -n "${ALL_SNAPS}" ] || [ -n "${HOOK_SNAPS}" ]; then
|
|
|
|
|
echo "${ALL_SNAPS}" > config/seeded-snaps
|
|
|
|
|
fi
|
|
|
|
|
snap_from_seed "${BASE_SEED}" config/seeded-snaps
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# grab a list of packags to remove for a "minimal" installation from the seed
|
|
|
|
|