[arch-commits] Commit in supermin/repos/community-x86_64 (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon May 24 15:27:25 UTC 2021
Date: Monday, May 24, 2021 @ 15:27:25
Author: foutrelis
Revision: 944730
archrelease: copy trunk to community-x86_64
Added:
supermin/repos/community-x86_64/PKGBUILD
(from rev 944729, supermin/trunk/PKGBUILD)
supermin/repos/community-x86_64/pacman6.patch
(from rev 944729, supermin/trunk/pacman6.patch)
Deleted:
supermin/repos/community-x86_64/PKGBUILD
supermin/repos/community-x86_64/pacman-iter.patch
-------------------+
PKGBUILD | 72 ++++++++++++++++++++++++++++------------------------
pacman-iter.patch | 67 ------------------------------------------------
pacman6.patch | 15 ++++++++++
3 files changed, 55 insertions(+), 99 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-24 15:27:20 UTC (rev 944729)
+++ PKGBUILD 2021-05-24 15:27:25 UTC (rev 944730)
@@ -1,32 +0,0 @@
-# Maintainer: Robin Broda <coderobe @ archlinux.org>
-# Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
-# Contributor: Achilleas Pipinellis <axilleas archlinux gr>
-
-pkgname=supermin
-pkgver=5.2.1
-pkgrel=1
-pkgdesc="Tool for creating supermin appliances"
-arch=('x86_64')
-url="http://people.redhat.com/~rjones/supermin/"
-license=('GPL')
-makedepends=('ocaml' 'ocaml-findlib')
-depends=('e2fsprogs' 'pacman' 'pacman-contrib' 'cpio')
-conflicts=('febootstrap<=3.21')
-source=("http://download.libguestfs.org/${pkgname}/5.2-stable/${pkgname}-${pkgver}.tar.gz"{,.sig})
-sha512sums=('f10ea404e0b27238ea3c25cb68f44e716aa180a45a420e63c1958768032f0710e8e3e7f1346cda780ea1f916f499499da2c02df4019d91ea3b3a69b75cfda545'
- 'SKIP')
-validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
-
-build() {
- cd "${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr
-
- make
-}
-
-package() {
- cd "${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}/" install
-}
Copied: supermin/repos/community-x86_64/PKGBUILD (from rev 944729, supermin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-24 15:27:25 UTC (rev 944730)
@@ -0,0 +1,40 @@
+# Maintainer: Robin Broda <coderobe @ archlinux.org>
+# Contributor: Xiao-Long Chen <chenxiaolong at cxl.epac.to>
+# Contributor: Achilleas Pipinellis <axilleas archlinux gr>
+
+pkgname=supermin
+pkgver=5.2.1
+pkgrel=2
+pkgdesc="Tool for creating supermin appliances"
+arch=('x86_64')
+url="http://people.redhat.com/~rjones/supermin/"
+license=('GPL')
+makedepends=('ocaml' 'ocaml-findlib')
+depends=('e2fsprogs' 'pacman' 'pacman-contrib' 'cpio')
+conflicts=('febootstrap<=3.21')
+source=("https://download.libguestfs.org/${pkgname}/5.2-stable/${pkgname}-${pkgver}.tar.gz"{,.sig}
+ "pacman6.patch")
+sha512sums=('f10ea404e0b27238ea3c25cb68f44e716aa180a45a420e63c1958768032f0710e8e3e7f1346cda780ea1f916f499499da2c02df4019d91ea3b3a69b75cfda545'
+ 'SKIP'
+ 'd1fe3258715171c7fd4be4a4a279d6c2caa75304aa3cf6b95c74a1b720a0ea71df7296f184e8a525273285abdafb2c4bda82145c4c10d398753cbc8dfea21161')
+validpgpkeys=('F7774FB1AD074A7E8C8767EA91738F73E1B768A0') # Richard W.M. Jones <rjones at redhat.com>
+
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch -Np1 -i ../pacman6.patch
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+
+ make
+}
+
+package() {
+ cd "${pkgname}-${pkgver}"
+
+ make DESTDIR="${pkgdir}/" install
+}
Deleted: pacman-iter.patch
===================================================================
--- pacman-iter.patch 2021-05-24 15:27:20 UTC (rev 944729)
+++ pacman-iter.patch 2021-05-24 15:27:25 UTC (rev 944730)
@@ -1,67 +0,0 @@
---- a/supermin/src/ph_pacman.ml 2019-10-14 21:28:25.138769513 +0200
-+++ b/supermin/src/ph_pacman.ml 2019-10-14 21:33:31.479364225 +0200
-@@ -171,24 +171,25 @@
- * only downloads each package once, even though each call to pacman will
- * download dependent packages as well.
- *)
-- List.iter (
-- fun name ->
-- let cmd = sprintf "\
-- set -e
-- umask 0000
-- cd %s
-- mkdir -p var/lib/pacman
-- %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
-- "
-- (quote tdir)
-- Config.fakeroot Config.pacman
-- (match !settings.packager_config with
-- | None -> ""
-- | Some filename -> " --config " ^ (quote filename))
-- (quoted_list names) in
-- if !settings.debug >= 2 then printf "%s" cmd;
-- if Sys.command cmd <> 0 then (
-- (* The package may not be in the main repos, check the AUR. *)
-+ let cmd = sprintf "\
-+ set -e
-+ umask 0000
-+ cd %s
-+ mkdir -p var/lib/pacman
-+ pacman-conf | grep -v CacheDir > tmp.conf
-+ %s %s%s -Syw --noconfirm --cachedir=$(pwd) --root=$(pwd) %s
-+ "
-+ (quote tdir)
-+ Config.fakeroot Config.pacman
-+ (match !settings.packager_config with
-+ | None -> " --config tmp.conf --dbpath var/lib/pacman"
-+ | Some filename -> " --config " ^ (quote filename))
-+ (quoted_list names) in
-+ if !settings.debug >= 2 then printf "%s" cmd;
-+ if Sys.command cmd <> 0 then (
-+ (* The package may not be in the main repos, check the AUR. *)
-+ List.iter (
-+ fun name ->
- let cmd = sprintf "\
- set -e
- umask 0000
-@@ -201,16 +201,16 @@
- "
- (quote tdir)
- (quote ("https://aur.archlinux.org/packages/" ^
-- (String.sub name 0 2) ^
-- "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
-+ (String.sub name 0 2) ^
-+ "/" ^ name ^ "/" ^ name ^ ".tar.gz"))
- (quote (name ^ ".tar.gz"))
- (quote name) (* cd *)
- Config.makepkg
- (quote name) (quote tdir) (* mv *) in
- if !settings.debug >= 2 then printf "%s" cmd;
- run_command cmd
-- );
-- ) names;
-+ ) names;
-+ );
-
- (* Unpack the downloaded packages. *)
- let cmd =
Copied: supermin/repos/community-x86_64/pacman6.patch (from rev 944729, supermin/trunk/pacman6.patch)
===================================================================
--- pacman6.patch (rev 0)
+++ pacman6.patch 2021-05-24 15:27:25 UTC (rev 944730)
@@ -0,0 +1,15 @@
+diff -upr supermin-5.2.1.orig/src/ph_pacman.ml supermin-5.2.1/src/ph_pacman.ml
+--- supermin-5.2.1.orig/src/ph_pacman.ml 2021-02-01 11:30:45.000000000 +0200
++++ supermin-5.2.1/src/ph_pacman.ml 2021-05-24 18:11:28.002222316 +0300
+@@ -219,7 +219,10 @@ let pacman_download_all_packages pkgs di
+ let cmd =
+ sprintf "
+ umask 0000
+- for f in %s/*.pkg.tar.*; do tar -xf \"$f\" -C %s; done
++ for f in %s/*.pkg.tar.*; do
++ [[ $f == *.sig ]] && continue
++ tar -xf \"$f\" -C %s
++ done
+ "
+ (quote tdir) (quote dir) in
+ if !settings.debug >= 2 then printf "%s" cmd;
More information about the arch-commits
mailing list