From c729c1a8e1e81ab3a3484cf9c64e226598a00864 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Mon, 21 Dec 2020 14:16:05 +0200 Subject: [PATCH 1/7] init --- .SRCINFO | 14 ++++++++++++++ .gitignore | 1 + PKGBUILD | 31 +++++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 .SRCINFO create mode 100644 .gitignore create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..bd84627 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,14 @@ +pkgbase = ntfs2btrfs + pkgdesc = Convertion from ntfs to btrfs keeping NT metadata + pkgver = 1 + pkgrel = 1 + arch = any + license = GPL + makedepends = cmake + makedepends = gcc + depends = fmt + source = git+https://github.com/maharmstone/ntfs2btrfs + md5sums = SKIP + +pkgname = ntfs2btrfs + diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e769f36 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +ntfs2btrfs pkg src diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..9e75b9f --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,31 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# Maintainer: Your Name +pkgname=ntfs2btrfs +pkgver=1 +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) + +build() { + cd "$pkgname" + mkdir b || true + cd b + cmake -DCMAKE_INSTALL_PREFIX='/usr' .. + make +} + +package() { + cd "$pkgname/b" + make DESTDIR="$pkgdir/" install +} From 52456070b7815c4c2d1783429eb107994cc8369c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Mon, 21 Dec 2020 14:27:39 +0200 Subject: [PATCH 2/7] fix ignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e769f36..17864e6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -ntfs2btrfs pkg src +ntfs2btrfs/ +pkg/ +src/ +*pkg.tar* From a0cbd68b11e5444e626603eed1754e6b770bb2e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Mon, 21 Dec 2020 14:35:42 +0200 Subject: [PATCH 3/7] oops --- .SRCINFO | 2 +- PKGBUILD | 14 +++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bd84627..c4e9323 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,5 +10,5 @@ pkgbase = ntfs2btrfs source = git+https://github.com/maharmstone/ntfs2btrfs md5sums = SKIP -pkgname = ntfs2btrfs +pkgname = ntfs2btrfs-git diff --git a/PKGBUILD b/PKGBUILD index 9e75b9f..4744d3c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,10 +1,6 @@ -# This is an example PKGBUILD file. Use this as a start to creating your own, -# and remove these comments. For more information, see 'man PKGBUILD'. -# NOTE: Please fill out the license field for your package! If it is unknown, -# then please put 'unknown'. - -# Maintainer: Your Name -pkgname=ntfs2btrfs +# Maintainer: N Fytilis +pkgbase=ntfs2btrfs +pkgname=$pkgbase-git pkgver=1 pkgrel=1 epoch= @@ -18,7 +14,7 @@ source=("git+https://github.com/maharmstone/ntfs2btrfs") md5sums=(SKIP) build() { - cd "$pkgname" + cd "$pkgbase" mkdir b || true cd b cmake -DCMAKE_INSTALL_PREFIX='/usr' .. @@ -26,6 +22,6 @@ build() { } package() { - cd "$pkgname/b" + cd "$pkgbase/b" make DESTDIR="$pkgdir/" install } From a69158fd0009d0fcec43b07f19a562b729fd6366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Mon, 21 Dec 2020 14:40:55 +0200 Subject: [PATCH 4/7] asdasdad --- .SRCINFO | 2 +- PKGBUILD | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c4e9323..2da4a17 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,4 +1,4 @@ -pkgbase = ntfs2btrfs +pkgbase = ntfs2btrfs-git pkgdesc = Convertion from ntfs to btrfs keeping NT metadata pkgver = 1 pkgrel = 1 diff --git a/PKGBUILD b/PKGBUILD index 4744d3c..740aee8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,7 @@ # Maintainer: N Fytilis -pkgbase=ntfs2btrfs -pkgname=$pkgbase-git +_pkgbase=ntfs2btrfs +pkgname=$_pkgbase-git +pkgbase=$_pkgbase-git pkgver=1 pkgrel=1 epoch= @@ -14,7 +15,7 @@ source=("git+https://github.com/maharmstone/ntfs2btrfs") md5sums=(SKIP) build() { - cd "$pkgbase" + cd "$_pkgbase" mkdir b || true cd b cmake -DCMAKE_INSTALL_PREFIX='/usr' .. @@ -22,6 +23,6 @@ build() { } package() { - cd "$pkgbase/b" + cd "$_pkgbase/b" make DESTDIR="$pkgdir/" install } From ba5449332dfeb1ca9a71c2a28027b2e12d224419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Sat, 25 Sep 2021 11:08:44 +0300 Subject: [PATCH 5/7] fix sbin exists in fs --- .SRCINFO | 3 +-- PKGBUILD | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2da4a17..257b573 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ntfs2btrfs-git pkgdesc = Convertion from ntfs to btrfs keeping NT metadata pkgver = 1 - pkgrel = 1 + pkgrel = 2 arch = any license = GPL makedepends = cmake @@ -11,4 +11,3 @@ pkgbase = ntfs2btrfs-git md5sums = SKIP pkgname = ntfs2btrfs-git - diff --git a/PKGBUILD b/PKGBUILD index 740aee8..589ceab 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ _pkgbase=ntfs2btrfs pkgname=$_pkgbase-git pkgbase=$_pkgbase-git pkgver=1 -pkgrel=1 +pkgrel=2 epoch= pkgdesc="Convertion from ntfs to btrfs keeping NT metadata" arch=(any) @@ -25,4 +25,5 @@ build() { package() { cd "$_pkgbase/b" make DESTDIR="$pkgdir/" install + mv $pkgdir/usr/sbin $pkgdir/usr/bin } From e787c7fc8bcccedf76ffed15d468620e72b397eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=9D=CE=B9=CE=BA=CF=8C=CE=BB=CE=B1=CE=BF=CF=82=20=CE=9A?= =?UTF-8?q?=CF=85=CF=81=CE=B9=CE=AC=CE=BA=CE=BF=CF=82=20=CE=A6=CF=85=CF=84?= =?UTF-8?q?=CE=AF=CE=BB=CE=B7=CF=82?= Date: Sun, 3 Oct 2021 14:46:21 +0300 Subject: [PATCH 6/7] pkgver remove tabs --- .SRCINFO | 4 ++-- PKGBUILD | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 257b573..f9a12f9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ntfs2btrfs-git pkgdesc = Convertion from ntfs to btrfs keeping NT metadata - pkgver = 1 - pkgrel = 2 + pkgver = r220.7664363 + pkgrel = 1 arch = any license = GPL makedepends = cmake diff --git a/PKGBUILD b/PKGBUILD index 589ceab..9ccf8ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ _pkgbase=ntfs2btrfs pkgname=$_pkgbase-git pkgbase=$_pkgbase-git -pkgver=1 -pkgrel=2 +pkgver=r220.7664363 +pkgrel=1 epoch= pkgdesc="Convertion from ntfs to btrfs keeping NT metadata" arch=(any) @@ -14,16 +14,21 @@ makedepends=(cmake gcc) source=("git+https://github.com/maharmstone/ntfs2btrfs") md5sums=(SKIP) +pkgver() { + cd "$_pkgbase" + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +} + build() { - cd "$_pkgbase" + cd "$_pkgbase" mkdir b || true cd b - cmake -DCMAKE_INSTALL_PREFIX='/usr' .. - make + cmake -DCMAKE_INSTALL_PREFIX='/usr' .. + make } package() { - cd "$_pkgbase/b" - make DESTDIR="$pkgdir/" install + cd "$_pkgbase/b" + make DESTDIR="$pkgdir/" install mv $pkgdir/usr/sbin $pkgdir/usr/bin } From 17b3fe7b1f5eb9ebf364bc786e28133971dd3d38 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 7/7] upgpkg: ntfs2btrfs-git 20220812.r10.gb8ae0f8-1 * PKGBUILD refactor to be same as non-git package * new versioning scheme --- ntfs2btrfs-git/.SRCINFO | 21 +++++++++++------ ntfs2btrfs-git/.gitignore | 4 ---- ntfs2btrfs-git/PKGBUILD | 49 ++++++++++++++++++++------------------- 3 files changed, 39 insertions(+), 35 deletions(-) delete mode 100644 ntfs2btrfs-git/.gitignore diff --git a/ntfs2btrfs-git/.SRCINFO b/ntfs2btrfs-git/.SRCINFO index f9a12f9..fd085fc 100644 --- a/ntfs2btrfs-git/.SRCINFO +++ b/ntfs2btrfs-git/.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/ntfs2btrfs-git/.gitignore b/ntfs2btrfs-git/.gitignore deleted file mode 100644 index 17864e6..0000000 --- a/ntfs2btrfs-git/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -ntfs2btrfs/ -pkg/ -src/ -*pkg.tar* diff --git a/ntfs2btrfs-git/PKGBUILD b/ntfs2btrfs-git/PKGBUILD index 9ccf8ba..9ef8d3d 100644 --- a/ntfs2btrfs-git/PKGBUILD +++ b/ntfs2btrfs-git/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 }