Compare commits
2 Commits
09c3a79d8c
...
d21f2de2dc
Author | SHA1 | Date |
---|---|---|
Lance Vick | d21f2de2dc | |
Lance Vick | 5fc2ab6d28 |
8
Makefile
8
Makefile
|
@ -3,7 +3,6 @@ altarch = $(subst x86_64,amd64,$(subst aarch64,arm64,$1))
|
|||
|
||||
TOOLCHAIN_VOLUME := $(PWD):/home/build
|
||||
TOOLCHAIN_WORKDIR := /home/build
|
||||
|
||||
DEFAULT_GOAL := $(or $(DEFAULT_GOAL),toolchain)
|
||||
ARCH := $(or $(ARCH),x86_64)
|
||||
TARGET := $(or $(TARGET),$(ARCH))
|
||||
|
@ -20,6 +19,7 @@ UID := $(shell id -u)
|
|||
GID := $(shell id -g)
|
||||
USER := $(UID):$(GID)
|
||||
CPUS := $(shell docker run debian nproc)
|
||||
ARCHIVE_SOURCES := true
|
||||
PRESERVE_CACHE := "false"
|
||||
GIT_REF := $(shell git log -1 --format=%H)
|
||||
GIT_AUTHOR := $(shell git log -1 --format=%an)
|
||||
|
@ -47,6 +47,10 @@ KEY_DIR := fetch/keys
|
|||
OUT_DIR := out
|
||||
docker = docker
|
||||
|
||||
PATH_PREFIX := /home/build/$(CACHE_DIR)/bin:/home/build/$(OUT_DIR)/linux/x86_64
|
||||
PREFIX := $(HOME)/.local/bin
|
||||
XDG_CONFIG_HOME := $(HOME)/.config
|
||||
|
||||
export
|
||||
|
||||
include $(CONFIG_DIR)/make.env
|
||||
|
@ -113,7 +117,7 @@ $(FETCH_DIR)/apt/Packages.bz2:
|
|||
--platform=linux/$(ARCH) \
|
||||
--env LOCAL_USER=$(UID):$(GID) \
|
||||
--env FETCH_DIR="$(FETCH_DIR)" \
|
||||
--env PACKAGES_LATEST=$(PACKAGES_LATEST) \
|
||||
--env ARCHIVE_SOURCES=$(ARCHIVE_SOURCES) \
|
||||
--volume $(PWD)/$(CONFIG_DIR):/config \
|
||||
--volume $(PWD)/$(SRC_DIR)/toolchain/scripts:/usr/local/bin \
|
||||
--volume $(PWD)/$(FETCH_DIR):/fetch \
|
||||
|
|
|
@ -5,10 +5,14 @@ set -e
|
|||
|
||||
ARCH=$(uname -m)
|
||||
|
||||
cp /config/apt-sources-x86_64.list /etc/apt/sources.list
|
||||
echo ARCHIVE_SOURCES -> $ARCHIVE_SOURCES
|
||||
if [[ "${ARCHIVE_SOURCES}" == "true" ]]; then
|
||||
rm /etc/apt/sources.list.d/*
|
||||
cp /config/apt-sources-x86_64.list /etc/apt/sources.list
|
||||
fi
|
||||
|
||||
cp /config/apt-hashes-x86_64.list /etc/apt/
|
||||
cp /config/apt-pins-x86_64.list /etc/apt/
|
||||
rm /etc/apt/sources.list.d/*
|
||||
apt update -o Acquire::Check-Valid-Until=false
|
||||
|
||||
until apt-get install \
|
||||
|
|
Loading…
Reference in New Issue