Skip to content

Commit

Permalink
chore: Build output unification tag
Browse files Browse the repository at this point in the history
  • Loading branch information
mpolitzer committed Feb 16, 2024
1 parent 745c8c6 commit 8341d10
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ TOOLCHAIN_TAG ?= 0.16.0

DEP_DIR := dep

KERNEL_VERSION ?= 6.5.9-ctsi-2
KERNEL_VERSION ?= 6.5.9-ctsi-2-output-unification-test1
KERNEL_SRCPATH := $(DEP_DIR)/linux-${KERNEL_VERSION}.tar.gz

OPENSBI_VERSION ?= 1.3.1-ctsi-1
Expand Down Expand Up @@ -120,7 +120,7 @@ $(DEP_DIR):
mkdir dep

$(KERNEL_SRCPATH): | $(DEP_DIR)
wget -O $@ https://github.com/cartesi/linux/archive/refs/tags/v$(KERNEL_VERSION).tar.gz
@wget -O $@ https://github.com/cartesi/linux/archive/v$(KERNEL_VERSION).tar.gz

$(OPENSBI_SRCPATH): | $(DEP_DIR)
wget -O $@ https://github.com/cartesi/opensbi/archive/refs/tags/v$(OPENSBI_VERSION).tar.gz
Expand Down
4 changes: 2 additions & 2 deletions build.mk
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ $(LINUX_DIR)/.config:

cross-deb: # TARGET == riscv64
mkdir -p $(DESTDIR)/DEBIAN
cat tools/template/cross-control.template | sed 's|ARG_KERNEL_VERSION|$(KERNEL_VERSION)|g' > $(DESTDIR)/DEBIAN/control
cat tools/template/cross-control.template | sed 's|ARG_KERNEL_VERSION|0.0.0|g' > $(DESTDIR)/DEBIAN/control
$(MAKE) -rC $(LINUX_DIR) $(LINUX_OPTS) headers_install \
INSTALL_HDR_PATH=$(abspath $(DESTDIR))/usr/riscv64-linux-gnu
find $(DESTDIR) -exec touch -d "$(KERNEL_TIMESTAMP)" {} \;
SOURCE_DATE_EPOCH="1" dpkg-deb -Zxz --root-owner-group --build $(DESTDIR) $(CROSS_DEB_FILENAME)

native-deb: # HOST == riscv64
mkdir -p $(DESTDIR)/DEBIAN
cat tools/template/native-control.template | sed 's|ARG_KERNEL_VERSION|$(KERNEL_VERSION)|g' > $(DESTDIR)/DEBIAN/control
cat tools/template/native-control.template | sed 's|ARG_KERNEL_VERSION|0.0.0|g' > $(DESTDIR)/DEBIAN/control
$(MAKE) -rC $(LINUX_DIR) $(LINUX_OPTS) headers_install \
INSTALL_HDR_PATH=$(abspath $(DESTDIR))/usr
find $(DESTDIR) -exec touch -d "$(KERNEL_TIMESTAMP)" {} \;
Expand Down
2 changes: 1 addition & 1 deletion shasumfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
bfc4d196b90592a2a6bef83ead9e196da6ab6d5978b48ee5e8ccf02913355bc2 dep/linux-6.5.9-ctsi-1.tar.gz
7782a5012313ec2365c39590b93cab4565a0c7ea3586daa3bd0ad05b2a8fc869 dep/linux-6.5.9-ctsi-2-output-unification-test1.tar.gz
267da33a34a023d9dcff3e7d9a8d58e7caefaff65441e38ff0114e4683dff176 dep/opensbi-1.3.1-ctsi-1.tar.gz

0 comments on commit 8341d10

Please sign in to comment.