summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-02-04 22:41:16 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-02-04 22:41:16 -0500
commitc7be40c324580c8bcda043c6904358640ea58b57 (patch)
treec2328bfa496843163c311afab253d87d6af430cc
parent11a5c34a9d9edc353e7c6da763186c59339ae229 (diff)
Adjust libremakepkg to work with pacman 5.0
-rw-r--r--src/chroot-tools/makechrootpkg.sh.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/chroot-tools/makechrootpkg.sh.patch b/src/chroot-tools/makechrootpkg.sh.patch
index db1ca2f..dc37344 100644
--- a/src/chroot-tools/makechrootpkg.sh.patch
+++ b/src/chroot-tools/makechrootpkg.sh.patch
@@ -1,5 +1,5 @@
---- makechrootpkg.sh.in 2015-06-06 14:55:45.001104732 -0600
-+++ makechrootpkg.sh.ugly 2015-06-07 19:00:01.855398639 -0600
+--- makechrootpkg.sh.in 2015-06-06 21:29:29.470252931 -0400
++++ makechrootpkg.sh.ugly 2016-02-04 22:30:13.682365085 -0500
@@ -1,4 +1,6 @@
#!/bin/bash
+# License: GNU GPLv2
@@ -231,7 +231,7 @@
- sudo -u builduser makepkg "$@"
+ # Sync deps now, as networking may be disabled during _chrootbuild
+ cp /repo/repo.db /var/lib/pacman/sync/repo.db
-+ sudo -u builduser makepkg "$@" -o
++ sudo -u builduser makepkg "$@" --nobuild
+}
+
+_chrootbuild() {
@@ -244,7 +244,7 @@
+
+ cd /startdir
+
-+ sudo -u builduser makepkg "$@" -e
++ sudo -u builduser makepkg "$@" --noextract --noprepare
}
+# Usage: move_products $copydir $owner