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

make dependecy and doc fixes

This commit is contained in:
Lance Vick 2023-06-16 12:58:05 -07:00
parent c55daf1cdf
commit 489fcbabf3
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -88,17 +88,22 @@ toolchain-shell: toolchain
.PHONY: toolchain-update .PHONY: toolchain-update
toolchain-update: toolchain-update:
rm \ rm -rf \
$(CONFIG_DIR)/apt-pins-x86_64.list \ $(CONFIG_DIR)/apt-pins-x86_64.list \
$(CONFIG_DIR)/apt-sources-x86_64.list \ $(CONFIG_DIR)/apt-sources-x86_64.list \
$(CONFIG_DIR)/apt-hashes-x86_64.list $(CONFIG_DIR)/apt-hashes-x86_64.list \
$(FETCH_DIR)/apt
$(MAKE) $(CONFIG_DIR)/apt-hashes-x86_64.list \ $(MAKE) $(CONFIG_DIR)/apt-hashes-x86_64.list \
$(CONFIG_DIR)/apt-base.list:
touch $(CONFIG_DIR)/apt-base.list
# Regenerate toolchain dependency packages to latest versions # Regenerate toolchain dependency packages to latest versions
$(CONFIG_DIR)/apt-base.list \
$(CONFIG_DIR)/apt-pins-x86_64.list \ $(CONFIG_DIR)/apt-pins-x86_64.list \
$(CONFIG_DIR)/apt-sources-x86_64.list \ $(CONFIG_DIR)/apt-sources-x86_64.list \
$(CONFIG_DIR)/apt-hashes-x86_64.list: $(CONFIG_DIR)/apt-hashes-x86_64.list: \
$(CONFIG_DIR)/apt-base.list
mkdir -p $(FETCH_DIR)/apt \ mkdir -p $(FETCH_DIR)/apt \
&& docker run \ && docker run \
--rm \ --rm \
@ -215,7 +220,7 @@ $(CACHE_DIR_ROOT)/toolchain.tar: \
$(CONFIG_DIR)/apt-sources-$(ARCH).list \ $(CONFIG_DIR)/apt-sources-$(ARCH).list \
$(CONFIG_DIR)/apt-pins-$(ARCH).list \ $(CONFIG_DIR)/apt-pins-$(ARCH).list \
$(CONFIG_DIR)/apt-hashes-$(ARCH).list \ $(CONFIG_DIR)/apt-hashes-$(ARCH).list \
$(FETCH_DIR)/apt/Packages.gz $(FETCH_DIR)/apt/Packages.bz2
mkdir -p $(CACHE_DIR) mkdir -p $(CACHE_DIR)
DOCKER_BUILDKIT=1 \ DOCKER_BUILDKIT=1 \
docker build \ docker build \

6
README.md
View File

@ -55,8 +55,8 @@ us as desired.
3. Define any build/dev dependencies for toolchain container 3. Define any build/dev dependencies for toolchain container
``` ```
echo "libfaketime" >> config/toolchain/packages-base.txt echo "libfaketime" >> config/apt-base.list
echo "build-essential" >> config/toolchain/packages-base.txt echo "build-essential" >> config/apt-base.list
``` ```
4. Lock a base Debian container image hash 4. Lock a base Debian container image hash
@ -97,7 +97,7 @@ make reproduce
### Add and lock a new container dependency ### Add and lock a new container dependency
``` ```
echo "vim-nox" >> config/toolchain/packages-base.txt echo "vim-nox" >> config/apt-base.list
make toolchain-update make toolchain-update
``` ```