From 77867f94b292648f504982c44fb1dfddf0ed7439 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 15 Jan 2025 12:29:45 -0300 Subject: [PATCH] refactor: remove libcmt debian packaging --- .github/workflows/main.yml | 20 -------------- .gitignore | 1 - Dockerfile | 24 ----------------- Makefile | 21 ++------------- sys-utils/libcmt/Makefile | 43 ------------------------------- sys-utils/libcmt/tools/control.in | 8 ------ 6 files changed, 2 insertions(+), 115 deletions(-) delete mode 100644 sys-utils/libcmt/tools/control.in diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bfa4d36..0c820f6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -91,24 +91,6 @@ jobs: path: | ${{ env.TOOLS_ROOTFS }}.html - - name: Build libcmt - id: docker_build_libcmt - uses: docker/build-push-action@v5 - with: - context: . - builder: ${{ steps.buildx.outputs.name }} - tags: ${{ env.TOOLS_IMAGE }}-libcmt - push: false - load: true - build-args: | - VERSION=${{ env.VERSION }} - target: libcmt-debian-packager - cache-from: type=gha,scope=regular,mode=max - cache-to: type=gha,scope=regular - - - name: Retrieve artifacts - run: make copy-libcmt - - name: Upload artifacts uses: actions/upload-artifact@v4 with: @@ -116,14 +98,12 @@ jobs: path: | ${{ env.TOOLS_DEB }} ${{ env.TOOLS_ROOTFS }} - libcmt/deb/* - name: Checksum artifacts if: startsWith(github.ref, 'refs/tags/v') run: | sha512sum ${{ env.TOOLS_DEB }} > ${{ env.TOOLS_DEB }}.sha512 sha512sum ${{ env.TOOLS_ROOTFS }} > ${{ env.TOOLS_ROOTFS }}.sha512 - for f in libcmt/deb/*; do sha512sum $f > $f.sha512; done - uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/v') diff --git a/.gitignore b/.gitignore index ec1aa91..8a4dcea 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ control machine-emulator-tools-*.tar.gz machine-emulator-tools-*.deb rootfs.* -libcmt-*.* package.json *.bin diff --git a/Dockerfile b/Dockerfile index d2c9d2f..f635245 100644 --- a/Dockerfile +++ b/Dockerfile @@ -70,30 +70,6 @@ RUN make -C ${BUILD_BASE}/tools/sys-utils -j$(nproc) all RUN make -C ${BUILD_BASE}/tools/sys-utils install \ DESTDIR=${BUILD_BASE}/tools/sys-utils_staging PREFIX=/usr -# build libcmt debian package -# ------------------------------------------------------------------------------ -FROM c-builder AS libcmt-debian-packager -ARG VERSION=0.0.0 -USER root - -RUN make -C ${BUILD_BASE}/tools/sys-utils/libcmt \ - ARG_VERSION=${VERSION} \ - PREFIX=/usr \ - DESTDIR=${BUILD_BASE}/install/run \ - install-run libcmt-v${VERSION}.deb - -RUN make -C ${BUILD_BASE}/tools/sys-utils/libcmt \ - ARG_VERSION=${VERSION} \ - PREFIX=/usr \ - DESTDIR=${BUILD_BASE}/install/dev \ - install-dev libcmt-dev-v${VERSION}.deb - -RUN make -C ${BUILD_BASE}/tools/sys-utils/libcmt \ - ARG_VERSION=${VERSION} \ - PREFIX=/usr/riscv64-linux-gnu \ - DESTDIR=${BUILD_BASE}/install/cross \ - install libcmt-dev-riscv64-cross-v${VERSION}.deb - # build rust tools # ------------------------------------------------------------------------------ FROM c-builder AS rust-env diff --git a/Makefile b/Makefile index 171b5a0..dc6c496 100644 --- a/Makefile +++ b/Makefile @@ -73,23 +73,6 @@ fs-license: . TMPFILE=$$(mktemp) && (cd fs/third-party/repo-info/; ./scan-local.sh $(TOOLS_ROOTFS_IMAGE) linux/riscv64) | tee $$TMPFILE && pandoc -s -f markdown -t html5 -o $(TOOLS_ROOTFS).html $$TMPFILE && rm -f $$TMPFILE -libcmt: - @mkdir $@ - -build-libcmt: - @docker buildx build --load \ - --target libcmt-debian-packager \ - --build-arg VERSION=$(VERSION) \ - -t $(TOOLS_IMAGE)-libcmt \ - -f Dockerfile \ - . - $(MAKE) copy-libcmt - -copy-libcmt: libcmt - @ID=`docker create $(TOOLS_IMAGE)-libcmt` && \ - docker cp $$ID:/opt/cartesi/tools/sys-utils/libcmt/build/deb/ libcmt && \ - docker rm $$ID - env: @echo VERSION=$(VERSION) @echo TOOLS_DEB=$(TOOLS_DEB) @@ -142,7 +125,7 @@ clean-image: @(docker rmi $(TOOLS_IMAGE) > /dev/null 2>&1 || true) clean: - @rm -f $(TOOLS_DEB) control rootfs* libcmt* + @rm -f $(TOOLS_DEB) control rootfs* @$(MAKE) -C sys-utils clean distclean: clean clean-image @@ -161,4 +144,4 @@ help: @echo ' env - print useful Makefile variables as a KEY=VALUE list' @echo ' clean - remove the generated artifacts' -.PHONY: build fs fs-license deb build-libcmt env setup setup-required help distclean +.PHONY: build fs fs-license deb env setup setup-required help distclean diff --git a/sys-utils/libcmt/Makefile b/sys-utils/libcmt/Makefile index 647b930..8159810 100644 --- a/sys-utils/libcmt/Makefile +++ b/sys-utils/libcmt/Makefile @@ -86,49 +86,6 @@ install-dev: $(libcmt_LIB) build/ffi.h install: install-run install-dev -# requires either install-run or install -debian-package: - mkdir -p $(dir $(DEB_FILENAME)) - dpkg-deb -Zxz --root-owner-group --build $(DESTDIR) $(DEB_FILENAME) - -$(DESTDIR)/DEBIAN/control: tools/control.in - mkdir -p $(@D) - sed -e 's|@PACKAGE@|$(ARG_PACKAGE)|' \ - -e 's|@VERSION@|$(ARG_VERSION)|' \ - -e 's|@ARCHITECTURE@|$(ARG_ARCHITECTURE)|' \ - -e 's|@SECTION@|$(ARG_SECTION)|' \ - -e 's|@PROVIDES@|$(ARG_PROVIDES)|' \ - -e 's|@DESCRIPTION@|$(ARG_DESCRIPTION)|' \ - $< > $@ - -# debian package variants -libcmt-v$(ARG_VERSION).deb: - $(MAKE) $(DESTDIR)/DEBIAN/control \ - ARG_PACKAGE=libcmt \ - ARG_ARCHITECTURE=riscv64 \ - ARG_PROVIDES=libcmt \ - ARG_SECTION=libs \ - ARG_DESCRIPTION="Cartesi Machine Tools" - $(MAKE) debian-package DEB_FILENAME=build/deb/$@ - -libcmt-dev-v$(ARG_VERSION).deb: - $(MAKE) $(DESTDIR)/DEBIAN/control \ - ARG_PACKAGE=libcmt-dev \ - ARG_ARCHITECTURE=riscv64 \ - ARG_PROVIDES=libcmt-dev \ - ARG_SECTION=devel \ - ARG_DESCRIPTION="Cartesi Machine Tools - (development files)" - $(MAKE) debian-package DEB_FILENAME=build/deb/$@ - -libcmt-dev-riscv64-cross-v$(ARG_VERSION).deb: - $(MAKE) $(DESTDIR)/DEBIAN/control \ - ARG_PACKAGE=libcmt-riscv64-cross \ - ARG_ARCHITECTURE=all \ - ARG_PROVIDES=libcmt-dev-riscv64-cross \ - ARG_SECTION=devel \ - ARG_DESCRIPTION="Cartesi Machine Tools - (development files) (riscv64)" - $(MAKE) debian-package DEB_FILENAME=build/deb/$@ - #------------------------------------------------------------------------------- mock_SRC := \ src/abi.c \ diff --git a/sys-utils/libcmt/tools/control.in b/sys-utils/libcmt/tools/control.in deleted file mode 100644 index 391dd65..0000000 --- a/sys-utils/libcmt/tools/control.in +++ /dev/null @@ -1,8 +0,0 @@ -Package: @PACKAGE@ -Version: @VERSION@ -Architecture: @ARCHITECTURE@ -Priority: optional -Section: @SECTION@ -Maintainer: Machine Reference Unit -Provides: @PROVIDES@ -Description: @DESCRIPTION@