diff options
Diffstat (limited to 'system/abuild/noarch.patch')
| -rw-r--r-- | system/abuild/noarch.patch | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/system/abuild/noarch.patch b/system/abuild/noarch.patch index 8c61d32a6..d6e59d4db 100644 --- a/system/abuild/noarch.patch +++ b/system/abuild/noarch.patch @@ -2,7 +2,7 @@ diff --git a/abuild.in b/abuild.in index b0c0f9c..a6a0fe1 100644 --- a/abuild.in +++ b/abuild.in -@@ -516,7 +516,7 @@ cleanpkg() { +@@ -518,7 +518,7 @@ cleanpkg() { rm -f "$REPODEST/$repo/src/$pkgname-$pkgver-r$pkgrel.src.tar.gz" for i in $allpackages; do subpkg_set "$i" @@ -11,7 +11,7 @@ index b0c0f9c..a6a0fe1 100644 rm -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk" done subpkg_unset -@@ -931,7 +931,7 @@ prepare_metafiles() { +@@ -943,7 +943,7 @@ prepare_metafiles() { if [ "$arch" != "$apkbuild_arch" ]; then local msg="Split function set arch=\"$arch\" for $name, use subpackages=pkg:split:arch format instead" @@ -20,7 +20,7 @@ index b0c0f9c..a6a0fe1 100644 warning "$msg" subpkgarch="$arch" fi -@@ -1027,7 +1027,7 @@ prepare_metafiles() { +@@ -1039,7 +1039,7 @@ prepare_metafiles() { prepare_trace_rpaths() { local dir="${subpkgdir:-$pkgdir}" local etype= soname= file= sover= @@ -29,7 +29,7 @@ index b0c0f9c..a6a0fe1 100644 options_has "!tracedeps" && return 0 # lets tell all the places we should look for .so files - all rpaths scanelf --quiet --recursive --rpath "$dir" \ -@@ -1115,10 +1115,10 @@ is_openrc_pkg() { +@@ -1137,10 +1137,10 @@ is_openrc_pkg() { archcheck() { options_has "!archcheck" && return 0 if dir_has_arch_binaries "${subpkgdir:-$pkgdir}"; then @@ -42,7 +42,7 @@ index b0c0f9c..a6a0fe1 100644 # we dont want -dev package go to noarch warning "No arch specific binaries found so arch should probably be set to \"noarch\"" fi -@@ -1317,7 +1317,7 @@ scan_shared_objects() { +@@ -1339,7 +1339,7 @@ scan_shared_objects() { local name="$1" controldir="$2" datadir="$3" local opt= i= @@ -51,7 +51,7 @@ index b0c0f9c..a6a0fe1 100644 return 0 fi -@@ -1520,7 +1520,7 @@ create_apks() { +@@ -1542,7 +1542,7 @@ create_apks() { abuild-sign -q control.tar.gz || exit 1 msg "Create $apk" @@ -60,7 +60,7 @@ index b0c0f9c..a6a0fe1 100644 mkdir -p "$REPODEST"/$repo/$subpkgarch cat control.tar.gz data.tar.gz > "$REPODEST"/$repo/$subpkgarch/$apk ) -@@ -1562,7 +1562,7 @@ update_abuildrepo_index() { +@@ -1590,7 +1590,7 @@ update_abuildrepo_index() { # thinks they are for $CARCH and apk-tools will fetch them from # correct URL path. Remainder of the script uses ${subpkgarch/noarch/$CARCH} # when expanding to the target repository path. @@ -69,7 +69,7 @@ index b0c0f9c..a6a0fe1 100644 list_has "$subpkgarch" "$allarch" || allarch="$allarch $subpkgarch" done subpkg_unset -@@ -1856,7 +1856,7 @@ apk_up2date() { +@@ -1936,7 +1936,7 @@ apk_up2date() { local i s for i in $allpackages; do subpkg_set "$i" @@ -78,7 +78,7 @@ index b0c0f9c..a6a0fe1 100644 if [ ! -f "$REPODEST/$repo/$subpkgarch/$subpkgname-$pkgver-r$pkgrel.apk" ]; then subpkg_unset return 1 -@@ -1872,7 +1872,7 @@ apk_up2date() { +@@ -1952,7 +1952,7 @@ apk_up2date() { else s="$startdir/${i##*/}" fi @@ -87,7 +87,7 @@ index b0c0f9c..a6a0fe1 100644 if [ "$s" -nt "$REPODEST/$repo/$pkgarch/$pkgname-$pkgver-r$pkgrel.apk" ]; then return 1 fi -@@ -1886,7 +1886,7 @@ abuildindex_up2date() { +@@ -1966,7 +1966,7 @@ abuildindex_up2date() { for i in $allpackages; do subpkg_set "$i" @@ -96,7 +96,7 @@ index b0c0f9c..a6a0fe1 100644 local dir="$REPODEST"/$repo/$subpkgarch local idx="$dir"/APKINDEX.tar.gz local file="$dir"/$subpkgname-$pkgver-r$pkgrel.apk -@@ -2253,7 +2253,7 @@ rootbld() { +@@ -2335,7 +2335,7 @@ rootbld() { stripbin() { local bin @@ -105,12 +105,11 @@ index b0c0f9c..a6a0fe1 100644 return 0 fi cd "${subpkgdir:-$pkgdir}" || return 1 -@@ -2597,7 +2597,7 @@ fi - export REPODEST SRCDEST +@@ -2679,7 +2679,7 @@ fi + fi # add dbg subpackage if its enabled globally --if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$arch" != "noarch" ]; then -+if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && ! list_has noarch "$arch"; then +-if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && [ "$pkgarch" != "noarch" ]; then ++if [ -n "$DEFAULT_DBG" ] && ! subpackage_types_has "dbg" && ! options_has "!dbg" && ! list_has noarch "$pkgarch"; then subpackages="$pkgname-dbg $subpackages" fi - |