Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] podman: adapt to PREFIX changes
Date: Sun, 23 Jun 2019 16:46:30 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12632@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 339 bytes --]

There is a new pull request by CameronNemo against master on the void-packages repository

https://github.com/CameronNemo/void-packages podman-man-destdir
https://github.com/void-linux/void-packages/pull/12632

podman: adapt to PREFIX changes
None

A patch file from https://github.com/void-linux/void-packages/pull/12632.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-podman-man-destdir-12632.patch --]
[-- Type: application/text/x-diff, Size: 1091 bytes --]

From d94b126c0cd5dae7dda2bad072cf19830ae52c33 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Sun, 23 Jun 2019 07:46:13 -0700
Subject: [PATCH] podman: adapt to PREFIX changes

Signed-off-by: Cameron Nemo <cnemo@tutanota.com>
---
 srcpkgs/podman/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index bcd14ac0d81..df2979121a4 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
 version=1.4.2
-revision=1
+revision=2
 wrksrc="libpod-${version}"
 build_style=go
 go_import_path="github.com/containers/libpod"
@@ -23,7 +23,7 @@ if [ "$CROSS_BUILD" ]; then
 fi
 
 post_install() {
-	make install.man PREFIX="${DESTDIR}/usr" DESTDIR="${DESTDIR}"
+	make install.man DESTDIR="${DESTDIR}" PREFIX="/usr"
 	make install.cni DESTDIR="${DESTDIR}"
 	vinstall completions/bash/podman 644 usr/share/bash-completion/completions
 	sed 's|cgroup_manager = "systemd"|cgroup_manager = "cgroupfs"|g' libpod.conf >libpod.cgfs.conf

             reply	other threads:[~2019-06-23 14:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-23 14:46 voidlinux-github [this message]
2019-06-23 15:16 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12632@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).