[PR PATCH] fix dependency sorting

[PR PATCH] fix dependency sorting

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages fix-dep-sort
https://github.com/void-linux/void-packages/pull/49260

fix dependency sorting
- common/hooks/pre-pkg/04-generate-runtime-deps: partially revert sorting
- base-system: rebuild for dep sorting
- base-container: rebuild for dep sorting
- base-container-full: rebuild for dep sorting
- base-chroot: rebuild for dep sorting

<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-dep-sort-49260.patch --]
[-- Type: text/x-diff, Size: 4369 bytes --]

From 10d179a066dbd3befee58c5d8954fee807ea1657 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:38:34 -0400
Subject: [PATCH 1/5] common/hooks/pre-pkg/04-generate-runtime-deps: partially
 revert sorting

only sort shlib-deps, as those are automatically found.
regular dependencies should not be sorted as that can mess with the
order for things like virtual packages or alternatives groups, notably
for gawk (needs to be before anything that depends on the awk virtual
package) and dash (needs to be before bash to select the correct sh
alternatives group).
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index f9cef1395fd9b0..488c8fc14ea3b2 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -40,8 +40,8 @@ store_pkgdestdir_rundeps() {
                      -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then
                     _curdep="${_curdep}>=0"
                 fi
-                printf -- "${_curdep}\n"
-            done | sort | xargs > ${PKGDESTDIR}/rdeps
+                printf "%s " "${_curdep}"
+            done > "${PKGDESTDIR}/rdeps"
         fi
 }
 

From 3f3b8bf4ed2ae656178596a5166132625954ef88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:53 -0400
Subject: [PATCH 2/5] base-system: rebuild for dep sorting

---
 srcpkgs/base-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index cf398262205995..f7886a4b6ccd71 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -1,7 +1,7 @@
 # Template file for 'base-system'
 pkgname=base-system
 version=0.114
-revision=1
+revision=2
 build_style=meta
 short_desc="Void Linux base system meta package"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 7249885c7d842833ed472426007bba4489790ab8 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:54 -0400
Subject: [PATCH 3/5] base-container: rebuild for dep sorting

---
 srcpkgs/base-container/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-container/template b/srcpkgs/base-container/template
index 3778e3ae956bb1..2d6531ad1d6bb5 100644
--- a/srcpkgs/base-container/template
+++ b/srcpkgs/base-container/template
@@ -1,7 +1,7 @@
 # Template file for 'base-container'
 pkgname=base-container
 version=0.3
-revision=2
+revision=3
 build_style=meta
 short_desc="Void Linux base system meta for minimal containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From bc3fbc1f3d04263f2a5f994c838b82ee6e21628b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:55 -0400
Subject: [PATCH 4/5] base-container-full: rebuild for dep sorting

---
 srcpkgs/base-container-full/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-container-full/template b/srcpkgs/base-container-full/template
index 8433cf0690325d..bc3b5cbfdccaa4 100644
--- a/srcpkgs/base-container-full/template
+++ b/srcpkgs/base-container-full/template
@@ -1,7 +1,7 @@
 # Template file for 'base-container-full'
 pkgname=base-container-full
 version=0.11
-revision=2
+revision=3
 build_style=meta
 short_desc="Void Linux base system meta package for containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 42a82ef983d53718b54e87f65abfda56dc229812 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:55 -0400
Subject: [PATCH 5/5] base-chroot: rebuild for dep sorting

---
 srcpkgs/base-chroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index e6f1684ed370da..dce82291617a42 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
 version=0.67
-revision=2
+revision=3
 bootstrap=yes
 build_style=meta
 short_desc="Minimal set of packages required for chroot with xbps-src"

Re: [PR PATCH] [Updated] fix dependency sorting

[classabbyamp]

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

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

https://github.com/classabbyamp/void-packages fix-dep-sort
https://github.com/void-linux/void-packages/pull/49260

fix dependency sorting
- common/hooks/pre-pkg/04-generate-runtime-deps: partially revert sorting
- base-system: rebuild for dep sorting
- base-container: rebuild for dep sorting
- base-container-full: rebuild for dep sorting
- base-chroot: rebuild for dep sorting

<!-- Uncomment relevant sections and delete options which are not applicable -->

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-dep-sort-49260.patch --]
[-- Type: text/x-diff, Size: 4429 bytes --]

From 638ed921dcb1f827d27532053665ddae33f5368d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:38:34 -0400
Subject: [PATCH 1/5] common/hooks/pre-pkg/04-generate-runtime-deps: partially
 revert sorting

only sort shlib-deps, as those are automatically found.
regular dependencies should not be sorted as that can mess with the
order for things like virtual packages or alternatives groups, notably
for gawk (needs to be before anything that depends on the awk virtual
package) and dash (needs to be before bash to select the correct sh
alternatives group).

partial revert of 5ec2556004b445a7d50a043606619722c630fde4
---
 common/hooks/pre-pkg/04-generate-runtime-deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
index f9cef1395fd9b0..488c8fc14ea3b2 100644
--- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh
+++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh
@@ -40,8 +40,8 @@ store_pkgdestdir_rundeps() {
                      -z "$($XBPS_UHELPER_CMD getpkgname ${_curdep} 2>/dev/null)" ]; then
                     _curdep="${_curdep}>=0"
                 fi
-                printf -- "${_curdep}\n"
-            done | sort | xargs > ${PKGDESTDIR}/rdeps
+                printf "%s " "${_curdep}"
+            done > "${PKGDESTDIR}/rdeps"
         fi
 }
 

From 9a433e02d63af14962fcc8e12953f983ee197ff5 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:53 -0400
Subject: [PATCH 2/5] base-system: rebuild for dep sorting

---
 srcpkgs/base-system/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index cf398262205995..f7886a4b6ccd71 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -1,7 +1,7 @@
 # Template file for 'base-system'
 pkgname=base-system
 version=0.114
-revision=1
+revision=2
 build_style=meta
 short_desc="Void Linux base system meta package"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From f41ca569e99ef22c6eeadba2dc2abe6603513a7c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:54 -0400
Subject: [PATCH 3/5] base-container: rebuild for dep sorting

---
 srcpkgs/base-container/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-container/template b/srcpkgs/base-container/template
index 3778e3ae956bb1..2d6531ad1d6bb5 100644
--- a/srcpkgs/base-container/template
+++ b/srcpkgs/base-container/template
@@ -1,7 +1,7 @@
 # Template file for 'base-container'
 pkgname=base-container
 version=0.3
-revision=2
+revision=3
 build_style=meta
 short_desc="Void Linux base system meta for minimal containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From 2b3089dfa2405d937aa687eb5693429e229ff25e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:55 -0400
Subject: [PATCH 4/5] base-container-full: rebuild for dep sorting

---
 srcpkgs/base-container-full/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-container-full/template b/srcpkgs/base-container-full/template
index 8433cf0690325d..bc3b5cbfdccaa4 100644
--- a/srcpkgs/base-container-full/template
+++ b/srcpkgs/base-container-full/template
@@ -1,7 +1,7 @@
 # Template file for 'base-container-full'
 pkgname=base-container-full
 version=0.11
-revision=2
+revision=3
 build_style=meta
 short_desc="Void Linux base system meta package for containers/chroots"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From c5a29e858d73136bf1636970b0d06591fc1a886b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Tue, 12 Mar 2024 15:41:55 -0400
Subject: [PATCH 5/5] base-chroot: rebuild for dep sorting

---
 srcpkgs/base-chroot/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/base-chroot/template b/srcpkgs/base-chroot/template
index e6f1684ed370da..dce82291617a42 100644
--- a/srcpkgs/base-chroot/template
+++ b/srcpkgs/base-chroot/template
@@ -1,7 +1,7 @@
 # Template file for 'base-chroot'
 pkgname=base-chroot
 version=0.67
-revision=2
+revision=3
 bootstrap=yes
 build_style=meta
 short_desc="Minimal set of packages required for chroot with xbps-src"

Re: [PR PATCH] [Merged]: fix dependency sorting

[classabbyamp]

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

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

fix dependency sorting
https://github.com/void-linux/void-packages/pull/49260

Description:
- common/hooks/pre-pkg/04-generate-runtime-deps: partially revert sorting
- base-system: rebuild for dep sorting
- base-container: rebuild for dep sorting
- base-container-full: rebuild for dep sorting
- base-chroot: rebuild for dep sorting

<!-- Uncomment relevant sections and delete options which are not applicable -->

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