fixup! Added deb package

cartesi · Jun 6, 2023 · ccf3840 · ccf3840
1 parent 90987ed
commit ccf3840
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/Dockerfile b/.github/workflows/Dockerfile
@@ -23,7 +23,7 @@ COPY . .
 RUN make -j$(nproc) dep && \
     make -j$(nproc) release=$RELEASE && \
     make -j$(nproc) uarch && \
-    make debian DESTDIR=$PWD/_install/usr PREFIX=/usr && \
+    make deb DESTDIR=$PWD/_install/usr PREFIX=/usr && \
     make install && \
     make clean && \
     rm -rf *

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
         run: make uarch-with-toolchain
 
       - name: Build deb package
-        run: make debian DESTDIR=$PWD/_install/usr PREFIX=/usr DEB_FILENAME=machine-emulator.deb
+        run: make deb DESTDIR=$PWD/_install/usr PREFIX=/usr DEB_FILENAME=machine-emulator.deb
 
       - name: Install [/opt/cartesi]
         run: make install

diff --git a/Makefile b/Makefile
@@ -252,7 +252,7 @@ install-emulator: $(BIN_INSTALL_PATH) $(LUA_INSTALL_CPATH)/cartesi $(LUA_INSTALL
 	cd src && $(INSTALL) $(EMU_TO_LUA_CARTESI_CPATH) $(LUA_INSTALL_CPATH)/cartesi
 	cd src && $(INSTALL) $(EMU_TO_LUA_PATH) $(LUA_INSTALL_PATH)/cartesi
 	cat tools/template/cartesi-machine.template | sed 's|ARG_LUA_PATH|$(LUA_RUNTIME_PATH)/?.lua|g;s|ARG_LUA_CPATH|${LUA_DEFAULT_C_PATHS}|g;s|ARG_INSTALL_PATH|$(IMAGES_RUNTIME_PATH)|g;s|ARG_BIN_RUNTIME_PATH|$(BIN_RUNTIME_PATH)|g' > $(BIN_INSTALL_PATH)/cartesi-machine
-	cat tools/template/cartesi-machine-stored-hash.template | sed 's|ARG_LUA_PATH|$(LUA_RUNTIME_PATH)/?.lua|g;s|ARG_LUA_CPATH|${LUA_DEFAULT_C_PATHS}|g;s|ARG_BIN_RUNTIME_PATH|${BIN_RUNTIME_PATH}|g' > $(BIN_INSTALL_PATH)/cartesi-machine-stored-hash
+	cat tools/template/cartesi-machine-stored-hash.template | sed 's|ARG_LUA_PATH|$(LUA_RUNTIME_PATH)/?.lua|g;s|ARG_LUA_CPATH|${LUA_DEFAULT_C_PATHS}|g;s|ARG_BIN_RUNTIME_PATH|$(BIN_RUNTIME_PATH)|g' > $(BIN_INSTALL_PATH)/cartesi-machine-stored-hash
 	cat tools/template/rollup-memory-range.template | sed 's|ARG_LUA_PATH|$(LUA_RUNTIME_PATH)/?.lua|g;s|ARG_LUA_CPATH|${LUA_DEFAULT_C_PATHS}|g;s|ARG_BIN_RUNTIME_PATH|${BIN_RUNTIME_PATH}|g' > $(BIN_INSTALL_PATH)/rollup-memory-range
 	cd $(BIN_INSTALL_PATH) && $(CHMOD_EXEC) $(EMU_TO_BIN) cartesi-machine cartesi-machine-stored-hash rollup-memory-range
 	cd $(BIN_INSTALL_PATH) && $(CHMOD_DATA) $(EMU_LUA_TO_BIN)
@@ -265,8 +265,8 @@ install-strip:
 	cd $(LIB_INSTALL_PATH) && $(STRIP_EXEC) $(DEP_TO_LIB)
 	cd $(LUA_INSTALL_CPATH) && $(STRIP_EXEC) *.so
 
-install: install-dep install-emulator install-strip $(INSTALL_PLAT) install-tests
-debian: install-dep install-emulator install-strip $(INSTALL_PLAT)
+install: install-dep install-emulator install-strip $(INSTALL_PLAT)
+deb: install
 	mkdir -p $(DESTDIR)/../DEBIAN $(DESTDIR)/share/doc/cartesi-machine/
 	$(INSTALL) COPYING $(DESTDIR)/share/doc/cartesi-machine/copyright
 	cat tools/template/control.template | sed 's|ARG_VERSION|$(MACHINE_EMULATOR_VERSION)|g' > $(DESTDIR)/../DEBIAN/control