From a532cc245c1338566f5d79c3a3e5a4fbf0a43d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 19 Apr 2023 22:50:00 +0200 Subject: [PATCH 1/5] upgpkg: ntfs2btrfs-git 20220812.r10.gb8ae0f8-1 * PKGBUILD refactor to be same as non-git package * new versioning scheme --- .SRCINFO | 21 ++++++++++++++------- .gitignore | 4 ---- PKGBUILD | 49 +++++++++++++++++++++++++------------------------ 3 files changed, 39 insertions(+), 35 deletions(-) delete mode 100644 .gitignore diff --git a/.SRCINFO b/.SRCINFO index f9a12f9..fd085fc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,20 @@ pkgbase = ntfs2btrfs-git - pkgdesc = Convertion from ntfs to btrfs keeping NT metadata - pkgver = r220.7664363 + pkgdesc = In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs + pkgver = 20220812.r10.gb8ae0f8 pkgrel = 1 - arch = any - license = GPL + url = https://github.com/maharmstone/ntfs2btrfs + arch = x86_64 + license = GPL2 + makedepends = git makedepends = cmake - makedepends = gcc + makedepends = pkgconf depends = fmt - source = git+https://github.com/maharmstone/ntfs2btrfs - md5sums = SKIP + depends = zlib + depends = lzo + depends = zstd + provides = ntfs2btrfs + conflicts = ntfs2btrfs + source = git+https://github.com/maharmstone/ntfs2btrfs.git + sha256sums = SKIP pkgname = ntfs2btrfs-git diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 17864e6..0000000 --- a/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -ntfs2btrfs/ -pkg/ -src/ -*pkg.tar* diff --git a/PKGBUILD b/PKGBUILD index 9ccf8ba..9ef8d3d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,34 +1,35 @@ -# Maintainer: N Fytilis -_pkgbase=ntfs2btrfs -pkgname=$_pkgbase-git -pkgbase=$_pkgbase-git -pkgver=r220.7664363 +# Maintainer: Manuel Hüsers +# Contributor: N Fytilis + +pkgname=ntfs2btrfs-git +pkgver=20220812.r10.gb8ae0f8 pkgrel=1 -epoch= -pkgdesc="Convertion from ntfs to btrfs keeping NT metadata" -arch=(any) -url="" -license=('GPL') -depends=(fmt) -makedepends=(cmake gcc) -source=("git+https://github.com/maharmstone/ntfs2btrfs") -md5sums=(SKIP) +pkgdesc="In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs" +arch=('x86_64') +url="https://github.com/maharmstone/${pkgname%-git}" +license=('GPL2') +depends=('fmt' 'zlib' 'lzo' 'zstd') +makedepends=('git' 'cmake' 'pkgconf') +provides=("${pkgname%-git}") +conflicts=("${pkgname%-git}") +source=("git+${url}.git") +sha256sums=('SKIP') pkgver() { - cd "$_pkgbase" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd "${pkgname%-git}" + git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/release-//g;s/-/./g' } build() { - cd "$_pkgbase" - mkdir b || true - cd b - cmake -DCMAKE_INSTALL_PREFIX='/usr' .. - make + cmake -B build -S "${pkgname%-git}" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_SBINDIR=bin \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTING=OFF + + cmake --build build } package() { - cd "$_pkgbase/b" - make DESTDIR="$pkgdir/" install - mv $pkgdir/usr/sbin $pkgdir/usr/bin + DESTDIR="$pkgdir" cmake --install build } From dca5057ca0e3857a3c8814f231a6545204a4f48b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 1 May 2023 23:23:46 +0200 Subject: [PATCH 2/5] upgpkg: ntfs2btrfs-git 20230501.r0.ga8fd1a2-1 upstream release --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fd085fc..1bfeed6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ntfs2btrfs-git pkgdesc = In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs - pkgver = 20220812.r10.gb8ae0f8 + pkgver = 20230501.r0.ga8fd1a2 pkgrel = 1 url = https://github.com/maharmstone/ntfs2btrfs arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index 9ef8d3d..e37a8a2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N Fytilis pkgname=ntfs2btrfs-git -pkgver=20220812.r10.gb8ae0f8 +pkgver=20230501.r0.ga8fd1a2 pkgrel=1 pkgdesc="In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs" arch=('x86_64') From b9cd57b9aed1a3ec5e7b94d6a0f0d55a40ea7690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 3 Dec 2023 20:31:07 +0100 Subject: [PATCH 3/5] Replace checksums with sha512 --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1bfeed6..54eeda1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -15,6 +15,6 @@ pkgbase = ntfs2btrfs-git provides = ntfs2btrfs conflicts = ntfs2btrfs source = git+https://github.com/maharmstone/ntfs2btrfs.git - sha256sums = SKIP + sha512sums = SKIP pkgname = ntfs2btrfs-git diff --git a/PKGBUILD b/PKGBUILD index e37a8a2..a8065c2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ makedepends=('git' 'cmake' 'pkgconf') provides=("${pkgname%-git}") conflicts=("${pkgname%-git}") source=("git+${url}.git") -sha256sums=('SKIP') +sha512sums=('SKIP') pkgver() { cd "${pkgname%-git}" From 5f52bcf10c9ad206e653ec30fa886c3bc85b2067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 11 Apr 2024 19:31:33 +0200 Subject: [PATCH 4/5] upgpkg: ntfs2btrfs-git 20240115.r0.g1d55788-1 upstream release --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 54eeda1..1d22772 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ntfs2btrfs-git pkgdesc = In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs - pkgver = 20230501.r0.ga8fd1a2 + pkgver = 20240115.r0.g1d55788 pkgrel = 1 url = https://github.com/maharmstone/ntfs2btrfs arch = x86_64 diff --git a/PKGBUILD b/PKGBUILD index a8065c2..b6e25ed 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: N Fytilis pkgname=ntfs2btrfs-git -pkgver=20230501.r0.ga8fd1a2 +pkgver=20240115.r0.g1d55788 pkgrel=1 pkgdesc="In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs" arch=('x86_64') From 8a2e4050ff5c83065999fcfdb330034e0e0fe1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 21 Jul 2024 07:32:40 +0200 Subject: [PATCH 5/5] Adopt SPDX identifiers for license fields --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1d22772..0856a1c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,7 +4,7 @@ pkgbase = ntfs2btrfs-git pkgrel = 1 url = https://github.com/maharmstone/ntfs2btrfs arch = x86_64 - license = GPL2 + license = GPL-2.0-or-later makedepends = git makedepends = cmake makedepends = pkgconf diff --git a/PKGBUILD b/PKGBUILD index b6e25ed..bc27729 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgrel=1 pkgdesc="In-place conversion of Microsoft's NTFS filesystem to the open-source filesystem Btrfs" arch=('x86_64') url="https://github.com/maharmstone/${pkgname%-git}" -license=('GPL2') +license=('GPL-2.0-or-later') depends=('fmt' 'zlib' 'lzo' 'zstd') makedepends=('git' 'cmake' 'pkgconf') provides=("${pkgname%-git}")