Skip to content

M
mkimage-profiles
You need to sign in or sign up before continuing.
Commit 813571cb authored by Michael Shigorin's avatar Michael Shigorin
Browse files
Options

dump sources.list to build.log

The seemingly obvious feature was proposed by torabora@. APTCONF complicates things a bit of course... (and was slightly kludgy btw; fixed)
parent 67a7f68e
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
image.in/Makefile
View file @ 813571cb
......@@ -18,12 +18,7 @@ COPY_TREE = ./files
# outdir shouldn't be wiped clean before use
CLEANUP_OUTDIR ?=
APTCONF := $(wildcard $(APTCONF))
ifeq (,$(APTCONF))
GLOBAL_HSH_APT_CONFIG = /etc/apt/apt.conf
else
GLOBAL_HSH_APT_CONFIG = $(APTCONF)
endif
GLOBAL_HSH_APT_CONFIG := $(wildcard $(APTCONF))
# the lib/build-*.mk comes from features.in/build-*/lib
include lib/*.mk
......
lib/profile.mk
View file @ 813571cb
......@@ -46,6 +46,16 @@ profile/init: distclean
git status -s && \
echo; \
fi $(LOG); \
fi
@{ \
eval `apt-config shell $${APTCONF:+-c=$(wildcard $(APTCONF))} \
SOURCELIST Dir::Etc::sourcelist/f \
SOURCEPARTS Dir::Etc::sourceparts/d`; \
find "$$SOURCEPARTS" -name '*.list' \
| xargs egrep -Rhv '^#|^[[:blank:]]*$$' "$$SOURCELIST" && \
echo; \
} $(LOG)
@if type -t git >&/dev/null; then \
if cd $(BUILDDIR); then \
git init -q && \
git add . && \
......
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