From 1ccfe791338aa9a538c7ce48a60fac0123414ec1 Mon Sep 17 00:00:00 2001 From: Viacheslav Date: Tue, 5 Jul 2022 20:31:58 +0200 Subject: [PATCH] Packagind files prepared --- .gitignore | 9 +++++++-- Makefile | 7 +++++++ packaging/deb/Makefile | 4 ++-- packaging/xbps/xbps-create.sh | 4 ++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 5886dbf..f6a45c1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,13 @@ spm .vscode/ **/.cache/ *.diff -spm-*/ +spmn-*/ *.xbps *.deb *repodata -exmperimental/ \ No newline at end of file +experimental/ +*.tar +*.zip +*.gz +*.txt +SHA* \ No newline at end of file diff --git a/Makefile b/Makefile index cf9d887..69db2b9 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,13 @@ dist-gz: git archive HEAD --format=tar > $(PKG_NAME).tar gzip $(PKG_NAME).tar +gen-sha256sums: + sha256sum $(PKG_NAME).tar.gz \ + $(PKG_NAME).zip \ + $(PKG_NAME).deb \ + $(PKG_NAME).amd64.xbps \ + $(PKG_NAME).x86_64.xbps > SHA256SUMS + install: release mkdir -p $(BIND) mkdir -p /usr/share/licenses/$(TARGET) diff --git a/packaging/deb/Makefile b/packaging/deb/Makefile index a4d6de1..6a7721d 100644 --- a/packaging/deb/Makefile +++ b/packaging/deb/Makefile @@ -6,13 +6,13 @@ build-deb-bin-img: @docker build -t deb-pkg-bin-$(PKG_NAME) -f ./packaging/deb/bin/Dockerfile . build-deb: - @docker run -v $(shell pwd):/usr/src/$(TARGET) --env PKG_FULL_NAME=$(PKG_NAME) deb-pkg-bin-$(PKG_NAME) + @docker run -v $(shell pwd):/usr/src/$(TARGET) --rm --env PKG_FULL_NAME=$(PKG_NAME) deb-pkg-bin-$(PKG_NAME) build-deb-src-img: @docker build -t deb-pkg-src-$(PKG_NAME) -f ./packaging/deb/src/Dockerfile . build-src-deb: - @docker run -v $(shell pwd):/usr/src/$(TARGET) deb-pkg-src-$(PKG_NAME) + @docker run --rm -v $(shell pwd):/usr/src/$(TARGET) deb-pkg-src-$(PKG_NAME) clean-deb: rm -f *.deb diff --git a/packaging/xbps/xbps-create.sh b/packaging/xbps/xbps-create.sh index 5c594ac..7eb2352 100755 --- a/packaging/xbps/xbps-create.sh +++ b/packaging/xbps/xbps-create.sh @@ -4,9 +4,9 @@ # arg $2 - architecture xbps-create --architecture "$2" \ - --pkgver spm-1.0_3 \ + --pkgver "$1" \ --dependencies "git>=2.9.5 xdg-utils>=1.0.0 libbsd>=0.2.1" \ - --homepage "https://github.com/slamko/spm" \ + --homepage "https://github.com/slamko/spmn" \ --desc "Suckless Patch Manager" \ --compression=xz \ --license GPLv3 \