Don't use `-C ../` when extracting portage
This is wrong and potentially can damage the host filesystem.
This commit is contained in:
parent
ce1c29a036
commit
0b3f6db39e
5
Makefile
5
Makefile
|
@ -56,7 +56,7 @@ EXTRA_WORLD =
|
||||||
inroot := systemd-nspawn --quiet \
|
inroot := systemd-nspawn --quiet \
|
||||||
--directory=$(CHROOT) \
|
--directory=$(CHROOT) \
|
||||||
--machine=$(APPLIANCE)-build \
|
--machine=$(APPLIANCE)-build \
|
||||||
--bind=$(PORTAGE_DIR):/usr/portage \
|
--bind=$(PORTAGE_DIR)/portage:/usr/portage \
|
||||||
--bind=$(PKGDIR):/usr/portage/packages \
|
--bind=$(PKGDIR):/usr/portage/packages \
|
||||||
--bind=$(DISTDIR):/usr/portage/distfiles
|
--bind=$(DISTDIR):/usr/portage/distfiles
|
||||||
|
|
||||||
|
@ -103,12 +103,11 @@ $(PORTAGE_DIR): portage-snapshot.tar.bz2
|
||||||
@scripts/echo Unpacking portage snapshot
|
@scripts/echo Unpacking portage snapshot
|
||||||
rm -rf $(PORTAGE_DIR)
|
rm -rf $(PORTAGE_DIR)
|
||||||
mkdir $(PORTAGE_DIR)
|
mkdir $(PORTAGE_DIR)
|
||||||
tar xf portage-snapshot.tar.bz2 -C $(PORTAGE_DIR)/..
|
tar xf portage-snapshot.tar.bz2 -C $(PORTAGE_DIR)
|
||||||
ifeq ($(EMERGE_RSYNC),YES)
|
ifeq ($(EMERGE_RSYNC),YES)
|
||||||
@scripts/echo Syncing portage tree
|
@scripts/echo Syncing portage tree
|
||||||
$(inroot) emerge --sync --quiet
|
$(inroot) emerge --sync --quiet
|
||||||
endif
|
endif
|
||||||
touch $(PORTAGE_DIR)
|
|
||||||
|
|
||||||
$(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab
|
$(PREPROOT): $(STAGE3) $(PORTAGE_DIR) configs/fstab
|
||||||
mkdir -p $(PKGDIR) $(DISTDIR)
|
mkdir -p $(PKGDIR) $(DISTDIR)
|
||||||
|
|
Loading…
Reference in New Issue