Explicitly pass config file to pbuilder
- Hand our pbuilderrc and hookdir directly to pdebuild, instead of
relying on the system config
Change-Id: I9cee014dfddd423f8fd59516fee7dd8873066b83
diff --git a/Dockerfile b/Dockerfile
index f781e44..e20fffe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,5 @@
ln -sfr /build/Makefile /Makefile && \
source /build/setup.sh && \
make -C /build prereqs'
-ADD pbuilderrc /etc/pbuilderrc
-ADD D05deps /var/cache/pbuilder/hooks/D05deps
VOLUME /var/lib/docker
diff --git a/packages.mk b/packages.mk
index 3e5d70b..af083e3 100644
--- a/packages.mk
+++ b/packages.mk
@@ -95,7 +95,9 @@
cd $(PRODUCT_OUT)/obj/$1; pdebuild \
--buildresult $(PRODUCT_OUT) -- \
- --basetgz $(ROOTDIR)/cache/base.tgz
+ --basetgz $(ROOTDIR)/cache/base.tgz \
+ --configfile $(ROOTDIR)/build/pbuilderrc \
+ --hookdir $(ROOTDIR)/build/pbuilder-hooks
sudo touch $(PRODUCT_OUT)/.$1-pbuilder
.PHONY:: $1
endef
diff --git a/D05deps b/pbuilder-hooks/D05deps
similarity index 100%
rename from D05deps
rename to pbuilder-hooks/D05deps
diff --git a/pbuilderrc b/pbuilderrc
index 8d7db21..0ad3c0f 100644
--- a/pbuilderrc
+++ b/pbuilderrc
@@ -6,6 +6,5 @@
# read pbuilderrc.5 document for notes on specific options.
MIRRORSITE=http://http.us.debian.org/debian
PBUILDERSATISFYDEPENDSCMD=/usr/lib/pbuilder/pbuilder-satisfydepends-apt
-HOOKDIR="/var/cache/pbuilder/hooks"
export DEPSBASE=$PRODUCT_OUT
BINDMOUNTS="$DEPSBASE $ROOTDIR"
