[PR PATCH] common/chroot-style: clean up bwrap.sh.

[PR PATCH] common/chroot-style: clean up bwrap.sh.

[ericonr]

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

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

https://github.com/ericonr/void-packages bwrap
https://github.com/void-linux/void-packages/pull/34023

common/chroot-style: clean up bwrap.sh.
--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.

<!-- 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 [skip CI](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/34023.patch is attached

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

From e4070e68231b72884ce0506e47791e0b77d730e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Nov 2021 01:29:32 -0300
Subject: [PATCH] common/chroot-style: clean up bwrap.sh.

--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.
---
 common/chroot-style/bwrap.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/chroot-style/bwrap.sh b/common/chroot-style/bwrap.sh
index dc1fca461a68..abb9ac0e94f2 100755
--- a/common/chroot-style/bwrap.sh
+++ b/common/chroot-style/bwrap.sh
@@ -18,6 +18,6 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-bwrap --dev-bind "$MASTERDIR" / --dev-bind "$DISTDIR" /void-packages \
+bwrap --bind "$MASTERDIR" / --ro-bind "$DISTDIR" /void-packages \
 	 --dev /dev --tmpfs /tmp --proc /proc \
-	${HOSTDIR:+--dev-bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
+	${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"

Re: common/chroot-style: clean up bwrap.sh.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/34023#issuecomment-965979394

Comment:
@thypon since you commited the initial build style.

Re: [PR PATCH] [Updated] common/chroot-style: clean up bwrap.sh.

[ericonr]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages bwrap
https://github.com/void-linux/void-packages/pull/34023

common/chroot-style: clean up bwrap.sh.
--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.

<!-- 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 [skip CI](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/34023.patch is attached

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

From 356026137c08eb8657fb204b6eeceedc80e419a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
Date: Thu, 11 Nov 2021 01:29:32 -0300
Subject: [PATCH] common/chroot-style: clean up bwrap.sh.

--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.

Also exec bwrap, as done in the uchroot and uunshare chroot styles. And
update homepage.
---
 common/chroot-style/bwrap.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/chroot-style/bwrap.sh b/common/chroot-style/bwrap.sh
index dc1fca461a68..de4323506a3e 100755
--- a/common/chroot-style/bwrap.sh
+++ b/common/chroot-style/bwrap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# This chroot script uses bubblewrap (see https://github.com/projectatomic/bubblewrap)
+# This chroot script uses bubblewrap (see https://github.com/containers/bubblewrap)
 #
 set -e
 readonly MASTERDIR="$1"
@@ -18,6 +18,6 @@ if [ -z "$MASTERDIR" -o -z "$DISTDIR" ]; then
 	exit 1
 fi
 
-bwrap --dev-bind "$MASTERDIR" / --dev-bind "$DISTDIR" /void-packages \
+exec bwrap --bind "$MASTERDIR" / --ro-bind "$DISTDIR" /void-packages \
 	 --dev /dev --tmpfs /tmp --proc /proc \
-	${HOSTDIR:+--dev-bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"
+	${HOSTDIR:+--bind "$HOSTDIR" /host} $EXTRA_ARGS "$@"

Re: [PR PATCH] [Merged]: common/chroot-style: clean up bwrap.sh.

[ericonr]

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

There's a merged pull request on the void-packages repository

common/chroot-style: clean up bwrap.sh.
https://github.com/void-linux/void-packages/pull/34023

Description:
--dev-bind isn't necessary in any case it was being used for. We can
also use --ro-bind for /void-packages.

A possible future improvement would be to mount / read only during the
actual build.

<!-- 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 [skip CI](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
-->