Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] lxc: update to 5.0.1
@ 2022-08-06  0:20 CameronNemo
  2022-08-07 15:41 ` [PR REVIEW] " sgn
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: CameronNemo @ 2022-08-06  0:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/CameronNemo/void-packages lxc5
https://github.com/void-linux/void-packages/pull/38493

lxc: update to 5.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lxc5-38493.patch --]
[-- Type: text/x-diff, Size: 3449 bytes --]

From 0ac24b1452c6a93e3e440e5cb93cee36da821c42 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 5 Aug 2022 14:30:08 -0700
Subject: [PATCH] lxc: update to 5.0.1

---
 srcpkgs/lxc/files/lxc-void |  6 +++---
 srcpkgs/lxc/template       | 23 ++++++++++-------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/lxc/files/lxc-void b/srcpkgs/lxc/files/lxc-void
index d4a97ee25987..948a5be9336a 100755
--- a/srcpkgs/lxc/files/lxc-void
+++ b/srcpkgs/lxc/files/lxc-void
@@ -42,8 +42,8 @@ arch=$(uname -m)
 default_path="/var/lib/lxc"
 LXC_TEMPLATE_CONFIG="/usr/share/lxc/config"
 
-# Install 'base-voidstrap' by default
-base_packages=('base-voidstrap')
+# Install 'base-minimal' by default
+base_packages=('base-minimal' 'dhcpcd' 'openssh' 'iproute2')
 declare -a additional_packages
 
 # split comma-separated string into an array
@@ -282,6 +282,6 @@ fi
 
 cat << EOF
 Void container ${name} is successfully created! The configuration is
-stored in ${config_path}/config. Please refer to http://www.voidlinux.eu
+stored in ${config_path}/config. Please refer to https://docs.voidlinux.org
 for information about configuring your Void installation.
 EOF
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index 1c10303f00d7..89b6efc580bf 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -1,13 +1,13 @@
 # Template file for 'lxc'
 pkgname=lxc
-version=4.0.12
+version=5.0.1
 revision=1
-build_style=gnu-configure
-configure_args="--enable-doc --enable-seccomp
- --enable-capabilities --enable-apparmor --with-distro=none
- --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log"
-hostmakedepends="automake libtool pkg-config docbook2x"
-makedepends="libcap-devel libseccomp-devel gnutls-devel libapparmor-devel"
+build_style=meson
+configure_args="-Dpam-cgroup=true -Drootfs-mount-path=/var/lxc/containers
+ -Dlog-path=/var/lxc/log -Dinit-script=[]"
+hostmakedepends="pkg-config docbook2x"
+makedepends="libcap-devel libseccomp-devel openssl-devel libapparmor-devel
+ pam-devel"
 depends="xz wget"
 _desc="Linux Containers"
 short_desc="${_desc} - utilities"
@@ -15,7 +15,7 @@ maintainer="Cameron Nemo <cnemo@tutanota.com>"
 license="LGPL-2.1-or-later"
 homepage="https://linuxcontainers.org"
 distfiles="https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"
-checksum=db242f8366fc63e8c7588bb2017b354173cf3c4b20abc18780debdc48b14d3ef
+checksum=d8195423bb1e206f8521d24b6cde4789f043960c7cf065990a9cf741dcfd4222
 
 conf_files="/etc/lxc/default.conf"
 make_dirs="
@@ -26,13 +26,10 @@ make_dirs="
 pre_configure() {
 	# make sure the build uses the new docbook2x format,
 	# even though the command has the old "docbook2man" name
-	sed -e 's,xdocbook2man,xforcedocbook2x,g' -i configure.ac
-	./autogen.sh
+	vsed -e "s,sgml2man.full_path(),'defnot-docbook2man',g" -i meson.build
 }
 
 post_install() {
-	vmkdir usr/share/bash-completion/completions
-	mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions/
 	# Install void lxc config/template.
 	vinstall ${FILESDIR}/void.common.conf 644 usr/share/lxc/config
 	vinstall ${FILESDIR}/lxc-void 755 usr/share/lxc/templates
@@ -47,7 +44,7 @@ liblxc_package() {
 }
 
 lxc-devel_package() {
-	depends="libcap-devel liblxc>=${version}_${revision}"
+	depends="${makedepends} liblxc>=${version}_${revision}"
 	short_desc="${_desc} - development files"
 	pkg_install() {
 		vmove usr/include

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2022-08-10 11:18 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-06  0:20 [PR PATCH] lxc: update to 5.0.1 CameronNemo
2022-08-07 15:41 ` [PR REVIEW] " sgn
2022-08-07 15:42 ` CameronNemo
2022-08-07 15:45 ` sgn
2022-08-07 15:47 ` sgn
2022-08-07 18:44 ` [PR PATCH] [Updated] " CameronNemo
2022-08-07 18:47 ` [PR REVIEW] " CameronNemo
2022-08-07 23:31 ` sgn
2022-08-09 15:28 ` sgn
2022-08-09 17:14 ` CameronNemo
2022-08-10 11:18 ` [PR PATCH] [Closed]: " sgn

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).