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

Merge branch 'master' of https://codeberg.org/distrust/toolchain

This commit is contained in:
Lance Vick 2023-06-01 18:05:46 -07:00
parent ee915227d5 46de4dddbd
commit 3f14cf21ba
Signed by: lrvick
GPG Key ID: 8E47A1EC35A1551D
3 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -107,7 +107,7 @@ reproduce: toolchain-clean
mkdir -p $(OUT_DIR) mkdir -p $(OUT_DIR)
cp $(DIST_DIR)/release.env $(OUT_DIR)/release.env cp $(DIST_DIR)/release.env $(OUT_DIR)/release.env
$(MAKE) TARGET=$(TARGET) VERSION=$(VERSION) $(MAKE) TARGET=$(TARGET) VERSION=$(VERSION)
diff -q $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt \ diff -q $(OUT_DIR) $(DIST_DIR) \
&& echo "Success: $(OUT_DIR) and $(DIST_DIR) are identical" && echo "Success: $(OUT_DIR) and $(DIST_DIR) are identical"
.PHONY: $(DIST_DIR) .PHONY: $(DIST_DIR)
@ -175,15 +175,6 @@ $(OUT_DIR)/release.env: | $(OUT_DIR)
echo 'GIT_KEY=$(GIT_KEY)' >> $(OUT_DIR)/release.env echo 'GIT_KEY=$(GIT_KEY)' >> $(OUT_DIR)/release.env
echo 'GIT_TIMESTAMP=$(GIT_TIMESTAMP)' >> $(OUT_DIR)/release.env echo 'GIT_TIMESTAMP=$(GIT_TIMESTAMP)' >> $(OUT_DIR)/release.env
$(OUT_DIR)/manifest.txt: $(wildcard $(OUT_DIR)/*)
find -L $(OUT_DIR) \
-type f \
-not -path "$(OUT_DIR)/manifest.txt" \
-exec openssl sha256 -r {} \; \
| sed -e 's/ \*out\// /g' -e 's/ \.\// /g' \
| LC_ALL=C sort -k2 \
> $@
check_executables := $(foreach exec,$(executables),\$(if \ check_executables := $(foreach exec,$(executables),\$(if \
$(shell which $(exec)),some string,$(error "No $(exec) in PATH"))) $(shell which $(exec)),some string,$(error "No $(exec) in PATH")))

15
README.md
View File

@ -80,21 +80,6 @@ us as desired.
") ")
``` ```
7. Define a release target for your project depending on manifest.txt
```
.PHONY: release
release: $(OUT_DIR)/hello $(OUT_DIR)/manifest.txt
mkdir -p $(RELEASE_DIR)
cp $(OUT_DIR)/hello $(RELEASE_DIR)/hello
cp $(OUT_DIR)/release.env $(RELEASE_DIR)/release.env
cp $(OUT_DIR)/manifest.txt $(RELEASE_DIR)/manifest.txt
```
Note that manifest.txt is optional, but it makes for an ideal single file
to sign if a release will contain more than one artifact.
## Usage ## ## Usage ##
### Build a new release ### Build a new release

4
scripts/packages-update
View File

@ -6,14 +6,12 @@ set -e
snapshot_url="http://snapshot.debian.org/archive/debian" snapshot_url="http://snapshot.debian.org/archive/debian"
snapshot_date=$(date +"%Y%m%dT000000Z") snapshot_date=$(date +"%Y%m%dT000000Z")
cat <<-EOF > /etc/apt/sources.list cat <<-EOF > /etc/apt/sources.list
deb http://deb.debian.org/debian bookworm main
deb http://security.debian.org/debian-security bookworm-security main
deb http://deb.debian.org/debian bookworm-updates main
deb [trusted=yes] ${snapshot_url}/${snapshot_date} bookworm main deb [trusted=yes] ${snapshot_url}/${snapshot_date} bookworm main
deb [trusted=yes] ${snapshot_url}-security/${snapshot_date} bookworm-security main deb [trusted=yes] ${snapshot_url}-security/${snapshot_date} bookworm-security main
deb [trusted=yes] ${snapshot_url}/${snapshot_date} bookworm-updates main deb [trusted=yes] ${snapshot_url}/${snapshot_date} bookworm-updates main
EOF EOF
cp /etc/apt/sources.list /config/toolchain/ cp /etc/apt/sources.list /config/toolchain/
rm /etc/apt/sources.list.d/*
ARCH=$(uname -m) ARCH=$(uname -m)