public
/
toolchain
5
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: public:d21f2de2dc92b854ba5b9872f85c7163865b2ea1
Branches Tags
public:main
public:ryan/fix-true-file-created
..
compare: public:09c3a79d8c7f1cbe42858266db400571bab5defc
Branches Tags
public:ryan/fix-true-file-created
public:main

No commits in common. "d21f2de2dc92b854ba5b9872f85c7163865b2ea1" and "09c3a79d8c7f1cbe42858266db400571bab5defc" have entirely different histories.
d21f2de2dc ... 09c3a79d8c

2 changed files with 4 additions and 12 deletions
Show Stats Expand all files Collapse all files

8
Makefile
View File

@ -3,6 +3,7 @@ altarch = $(subst x86_64,amd64,$(subst aarch64,arm64,$1))
TOOLCHAIN_VOLUME := $(PWD):/home/build TOOLCHAIN_VOLUME := $(PWD):/home/build
TOOLCHAIN_WORKDIR := /home/build TOOLCHAIN_WORKDIR := /home/build
DEFAULT_GOAL := $(or $(DEFAULT_GOAL),toolchain) DEFAULT_GOAL := $(or $(DEFAULT_GOAL),toolchain)
ARCH := $(or $(ARCH),x86_64) ARCH := $(or $(ARCH),x86_64)
TARGET := $(or $(TARGET),$(ARCH)) TARGET := $(or $(TARGET),$(ARCH))
@ -19,7 +20,6 @@ UID := $(shell id -u)
GID := $(shell id -g) GID := $(shell id -g)
USER := $(UID):$(GID) USER := $(UID):$(GID)
CPUS := $(shell docker run debian nproc) CPUS := $(shell docker run debian nproc)
ARCHIVE_SOURCES := true
PRESERVE_CACHE := "false" PRESERVE_CACHE := "false"
GIT_REF := $(shell git log -1 --format=%H) GIT_REF := $(shell git log -1 --format=%H)
GIT_AUTHOR := $(shell git log -1 --format=%an) GIT_AUTHOR := $(shell git log -1 --format=%an)
@ -47,10 +47,6 @@ KEY_DIR := fetch/keys
OUT_DIR := out OUT_DIR := out
docker = docker 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 export
include $(CONFIG_DIR)/make.env include $(CONFIG_DIR)/make.env
@ -117,7 +113,7 @@ $(FETCH_DIR)/apt/Packages.bz2:
--platform=linux/$(ARCH) \ --platform=linux/$(ARCH) \
--env LOCAL_USER=$(UID):$(GID) \ --env LOCAL_USER=$(UID):$(GID) \
--env FETCH_DIR="$(FETCH_DIR)" \ --env FETCH_DIR="$(FETCH_DIR)" \
--env ARCHIVE_SOURCES=$(ARCHIVE_SOURCES) \ --env PACKAGES_LATEST=$(PACKAGES_LATEST) \
--volume $(PWD)/$(CONFIG_DIR):/config \ --volume $(PWD)/$(CONFIG_DIR):/config \
--volume $(PWD)/$(SRC_DIR)/toolchain/scripts:/usr/local/bin \ --volume $(PWD)/$(SRC_DIR)/toolchain/scripts:/usr/local/bin \
--volume $(PWD)/$(FETCH_DIR):/fetch \ --volume $(PWD)/$(FETCH_DIR):/fetch \

6
scripts/packages-fetch
View File

@ -5,14 +5,10 @@ set -e
ARCH=$(uname -m) ARCH=$(uname -m)
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 cp /config/apt-sources-x86_64.list /etc/apt/sources.list
fi
cp /config/apt-hashes-x86_64.list /etc/apt/ cp /config/apt-hashes-x86_64.list /etc/apt/
cp /config/apt-pins-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 apt update -o Acquire::Check-Valid-Until=false
until apt-get install \ until apt-get install \