[arch-commits] Commit in osquery/trunk (PKGBUILD)

Anatol Pomozov anatolik at gemini.archlinux.org
Thu Jun 2 19:45:03 UTC 2022


    Date: Thursday, June 2, 2022 @ 19:45:03
  Author: anatolik
Revision: 1219002

move patching into prepare()

Modified:
  osquery/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-02 19:42:53 UTC (rev 1219001)
+++ PKGBUILD	2022-06-02 19:45:03 UTC (rev 1219002)
@@ -19,6 +19,15 @@
             '88cba2eebd12079bf3a4a8c5ba4ed34b1b5ccd9f9ac3fa518f1591396176666d'
             '96218ef5b7d6d6deb3a7b4b3dfed8068b7e4d10acd5b19372b9882f89d4478a8')
 
+prepare() {
+  cd osquery
+
+  git submodule update --init --recursive
+
+  (cd $srcdir/osquery/libraries/cmake/source/libaudit/src && patch -p1 < $srcdir/libaudit.patch)
+  (cd $srcdir/osquery/libraries/cmake/source/ebpfpub/src/ && git submodule update --init && cd libraries/ebpf-common/src/ && patch -p1 < $srcdir/ebpf-common.patch)
+}
+
 build() {
   cd osquery
 
@@ -26,10 +35,6 @@
       -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DOSQUERY_VERSION=$pkgver \
       -G Ninja -S . -B build
 
-  # submodules are checked out by cmake, patch it after it were checked out
-  (cd $srcdir/osquery/libraries/cmake/source/libaudit/src && git reset --hard && patch -p1 < $srcdir/libaudit.patch)
-  (cd $srcdir/osquery/libraries/cmake/source/ebpfpub/src && git reset --hard && git submodule update --init && cd libraries/ebpf-common/src && git reset --hard && patch -p1 < $srcdir/ebpf-common.patch)
-
   ninja -C build
 }
 



More information about the arch-commits mailing list