vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Also create relibc toolchain tarball

Browse source
This commit is contained in:
Jeremy Soller 2019-03-16 20:01:34 -06:00
parent f947d2b0dd
commit 4105029d0d
No known key found for this signature in database
GPG key ID: E988B49EE78A7FB1
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -70,11 +70,11 @@ ci-img: FORCE
build/livedisk-efi.iso.gz
rm -rf build/img
mkdir -p build/img
mv build/coreboot.elf.gz build/img/redox_$(IMG_TAG)_coreboot.elf.gz
mv build/harddrive.bin.gz build/img/redox_$(IMG_TAG)_harddrive.bin.gz
mv build/livedisk.iso.gz build/img/redox_$(IMG_TAG)_livedisk.iso.gz
mv build/harddrive-efi.bin.gz build/img/redox_$(IMG_TAG)_harddrive-efi.bin.gz
mv build/livedisk-efi.iso.gz build/img/redox_$(IMG_TAG)_livedisk-efi.iso.gz
cp "build/coreboot.elf.gz" "build/img/redox_$(IMG_TAG)_coreboot.elf.gz"
cp "build/harddrive.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive.bin.gz"
cp "build/livedisk.iso.gz" "build/img/redox_$(IMG_TAG)_livedisk.iso.gz"
cp "build/harddrive-efi.bin.gz" "build/img/redox_$(IMG_TAG)_harddrive-efi.bin.gz"
cp "build/livedisk-efi.iso.gz" "build/img/redox_$(IMG_TAG)_livedisk-efi.iso.gz"
cd build/img && sha256sum -b * > SHA256SUM
# CI packaging target
@ -86,10 +86,14 @@ ci-pkg: prefix FORCE
./repo.sh "$${PACKAGES}"
# CI toolchain
ci-toolchain: prefix/$(TARGET)/gcc-install.tar.gz
ci-toolchain: FORCE
$(MAKE) PREFIX_BINARY=0 \
"prefix/$(TARGET)/gcc-install.tar.gz" \
"prefix/$(TARGET)/relibc-install.tar.gz"
rm -rf build/toolchain
mkdir -p "build/toolchain/$(TARGET)"
mv "$<" "build/toolchain/$(TARGET)"
cp "prefix/$(TARGET)/gcc-install.tar.gz" "build/toolchain/$(TARGET)/gcc-install.tar.gz"
cp "prefix/$(TARGET)/relibc-install.tar.gz" "build/toolchain/$(TARGET)/relibc-install.tar.gz"
cd "build/toolchain/$(TARGET)" && sha256sum -b * > SHA256SUM
env: prefix FORCE

8
mk/prefix.mk
View file

@ -26,6 +26,14 @@ $(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX)/gcc-install
touch "$@.partial"
mv "$@.partial" "$@"
$(PREFIX)/relibc-install.tar.gz: $(PREFIX)/relibc-install
tar \
--create \
--gzip \
--file "$@" \
--directory="$<" \
.
ifeq ($(PREFIX_BINARY),1)
$(PREFIX)/gcc-install.tar.gz: