Date: Monday, October 3, 2022 @ 20:30:40
  Author: eworm
Revision: 457151

upgpkg: f2fs-tools 1.15.0-2: fix build, and rebuild with recent change

Modified:
  f2fs-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   46 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 34 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2022-10-03 20:26:28 UTC (rev 457150)
+++ PKGBUILD    2022-10-03 20:30:40 UTC (rev 457151)
@@ -4,7 +4,7 @@
 pkgname=f2fs-tools
 _tag='64f2596142800c215cb40a658ebd5793ed37c936' # git rev-parse v${pkgver}
 pkgver=1.15.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Tools for Flash-Friendly File System (F2FS)'
 arch=('x86_64')
 
url='https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/about/'
@@ -16,26 +16,48 @@
 
source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git#tag=${_tag}";)
 sha256sums=('SKIP')
 
+_backports=(
+  # f2fs-tools: fix build error on lz4-1.9.4
+  '19f77c6f6277a274434d6d8883f50e7955c6a8db'
+)
+
+_reverts=(
+)
+
 prepare() {
-       cd "${pkgname}"
+  cd "${pkgname}"
 
-       autoreconf -fi
+  local _c
+  for _c in "${_backports[@]}"; do
+    if [[ $_c == *..* ]]; then
+      git log --oneline --reverse "${_c}"
+    else
+      git log --oneline -1 "${_c}"
+    fi
+    git cherry-pick -n -m1 "${_c}"
+  done
+  for _c in "${_reverts[@]}"; do
+    git log --oneline -1 "${_c}"
+    git revert -n "${_c}"
+  done
+
+  autoreconf -fi
 }
 
 build() {
-       cd "${pkgname}"
+  cd "${pkgname}"
 
-       ./configure \
-               --prefix=/usr \
-               --sbindir=/usr/bin
-       make
+  ./configure \
+    --prefix=/usr \
+    --sbindir=/usr/bin
+  make
 }
 
 package() {
-       cd "${pkgname}"
+  cd "${pkgname}"
 
-       make DESTDIR="${pkgdir}/" sbindir=/usr/bin install
+  make DESTDIR="${pkgdir}/" sbindir=/usr/bin install
 
-       # /usr/bin/sg_write_buffer is provided in sg3_utils
-       rm "${pkgdir}"/usr/bin/sg_write_buffer
+  # /usr/bin/sg_write_buffer is provided in sg3_utils
+  rm "${pkgdir}"/usr/bin/sg_write_buffer
 }

Reply via email to