diff options
| author | Luflosi | 2021-10-09 00:58:58 +0200 |
|---|---|---|
| committer | Luflosi | 2021-10-09 01:05:40 +0200 |
| commit | 73625f1b461f9dee5f70997d5961414e5d8eeec3 (patch) | |
| tree | 3c3f79b78b20f673e72dd7fd7169a6308b133a31 | |
| parent | c3da4488345d720776050f6a562e718d238589fb (diff) | |
| download | aur-73625f1b461f9dee5f70997d5961414e5d8eeec3.tar.gz | |
Remove second patch which is no longer needed
I upstreamed it in https://github.com/linux-apfs/apfsprogs/pull/8.
This also fixes an issue where the symlinks for the fsck.apfs and mkfs.apfs binaries and manuals would not point to the correct files when DESTDIR was changed. This was probably an oversight when the patch was created.
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | destdir.patch | 40 |
3 files changed, 2 insertions, 51 deletions
@@ -10,9 +10,7 @@ pkgbase = apfsprogs-git provides = apfsprogs=r345.5efac5a conflicts = apfsprogs source = git+https://github.com/eafer/apfsprogs - source = destdir.patch sha256sums = SKIP - sha256sums = 65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac pkgname = apfsprogs-git @@ -12,10 +12,8 @@ depends=('glibc') makedepends=('git') conflicts=("$_pkgname") provides=("$_pkgname=$pkgver") -source=('git+https://github.com/eafer/apfsprogs' - 'destdir.patch') -sha256sums=('SKIP' - '65c7af8a2538536bcf9e62b152893849b2cd1092040f5bc6ec2a33040027f8ac') +source=('git+https://github.com/eafer/apfsprogs') +sha256sums=('SKIP') _progs=(apfsck mkapfs) @@ -24,11 +22,6 @@ pkgver() { printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } -prepare() { - cd $_pkgname - patch -Np1 -i ../destdir.patch -} - build() { cd $_pkgname diff --git a/destdir.patch b/destdir.patch deleted file mode 100644 index c49773277cf5..000000000000 --- a/destdir.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/apfsck/Makefile b/apfsck/Makefile -index e6d6f84..3636b2b 100644 ---- a/apfsck/Makefile -+++ b/apfsck/Makefile -@@ -37,9 +37,9 @@ endif - clean: - rm -f $(OBJS) $(DEPS) apfsck - install: -- install -d $(BINDIR) -- install -t $(BINDIR) apfsck -- ln -fs -T $(BINDIR)/apfsck $(BINDIR)/fsck.apfs -- install -d $(MANDIR) -- install -m 644 -t $(MANDIR) apfsck.8 -- ln -fs -T $(MANDIR)/apfsck.8 $(MANDIR)/fsck.apfs.8 -+ install -d $(DESTDIR)$(BINDIR) -+ install -t $(DESTDIR)$(BINDIR) apfsck -+ ln -fs -T $(BINDIR)/apfsck $(DESTDIR)$(BINDIR)/fsck.apfs -+ install -d $(DESTDIR)$(MANDIR) -+ install -m 644 -t $(DESTDIR)$(MANDIR) apfsck.8 -+ ln -fs -T $(MANDIR)/apfsck.8 $(DESTDIR)$(MANDIR)/fsck.apfs.8 -diff --git a/mkapfs/Makefile b/mkapfs/Makefile -index 67b39ab..bb66dd1 100644 ---- a/mkapfs/Makefile -+++ b/mkapfs/Makefile -@@ -36,9 +36,9 @@ endif - clean: - rm -f $(OBJS) $(DEPS) mkapfs - install: -- install -d $(BINDIR) -- install -t $(BINDIR) mkapfs -- ln -fs -T $(BINDIR)/mkapfs $(BINDIR)/mkfs.apfs -- install -d $(MANDIR) -- install -m 644 -t $(MANDIR) mkapfs.8 -- ln -fs -T $(MANDIR)/mkapfs.8 $(MANDIR)/mkfs.apfs.8 -+ install -d $(DESTDIR)$(BINDIR) -+ install -t $(DESTDIR)$(BINDIR) mkapfs -+ ln -fs -T $(BINDIR)/mkapfs $(DESTDIR)$(BINDIR)/mkfs.apfs -+ install -d $(DESTDIR)$(MANDIR) -+ install -m 644 -t $(DESTDIR)$(MANDIR) mkapfs.8 -+ ln -fs -T $(MANDIR)/mkapfs.8 $(DESTDIR)$(MANDIR)/mkfs.apfs.8 |