make dependecy and doc fixes
This commit is contained in:
parent
c55daf1cdf
commit
489fcbabf3
15
Makefile
15
Makefile
|
@ -88,17 +88,22 @@ toolchain-shell: toolchain
|
|||
|
||||
.PHONY: toolchain-update
|
||||
toolchain-update:
|
||||
rm \
|
||||
rm -rf \
|
||||
$(CONFIG_DIR)/apt-pins-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 \
|
||||
|
||||
|
||||
$(CONFIG_DIR)/apt-base.list:
|
||||
touch $(CONFIG_DIR)/apt-base.list
|
||||
|
||||
# Regenerate toolchain dependency packages to latest versions
|
||||
$(CONFIG_DIR)/apt-base.list \
|
||||
$(CONFIG_DIR)/apt-pins-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 \
|
||||
&& docker run \
|
||||
--rm \
|
||||
|
@ -215,7 +220,7 @@ $(CACHE_DIR_ROOT)/toolchain.tar: \
|
|||
$(CONFIG_DIR)/apt-sources-$(ARCH).list \
|
||||
$(CONFIG_DIR)/apt-pins-$(ARCH).list \
|
||||
$(CONFIG_DIR)/apt-hashes-$(ARCH).list \
|
||||
$(FETCH_DIR)/apt/Packages.gz
|
||||
$(FETCH_DIR)/apt/Packages.bz2
|
||||
mkdir -p $(CACHE_DIR)
|
||||
DOCKER_BUILDKIT=1 \
|
||||
docker build \
|
||||
|
|
|
@ -55,8 +55,8 @@ us as desired.
|
|||
3. Define any build/dev dependencies for toolchain container
|
||||
|
||||
```
|
||||
echo "libfaketime" >> config/toolchain/packages-base.txt
|
||||
echo "build-essential" >> config/toolchain/packages-base.txt
|
||||
echo "libfaketime" >> config/apt-base.list
|
||||
echo "build-essential" >> config/apt-base.list
|
||||
```
|
||||
|
||||
4. Lock a base Debian container image hash
|
||||
|
@ -97,7 +97,7 @@ make reproduce
|
|||
### 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
|
||||
```
|
||||
|
||||
|
|
Reference in New Issue