Przemyslaw Pawelczyk: 2 main/abuild: Make default_prepare() always end up in "$builddir". main/abuild: Make default_prepare() always end up in "$builddir". 4 files changed, 76 insertions(+), 8 deletions(-)
> ...-default_prepare-always-end-up-in-builddi.patch | 30 > ++++++++++++++++++++++ > main/abuild/APKBUILD | 12 ++++++--- 2 > files changed, 38 insertions(+), 4 deletions(-) create mode 100644 > main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch We generally want abuild patches to first go to abuild.git.
---- On Wed, 07 Dec 2016 09:04:13 +0100 Timo Teras <timo.teras@iki.fi> wrote ---- > On Sat, 3 Dec 2016 20:06:16 +0100 > Przemyslaw Pawelczyk <przemoc@zoho.com> wrote: > > > ...-default_prepare-always-end-up-in-builddi.patch | 30 > > ++++++++++++++++++++++ > > main/abuild/APKBUILD | 12 ++++++--- 2 > > files changed, 38 insertions(+), 4 deletions(-) create mode 100644 > > main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch > > We generally want abuild patches to first go to abuild.git. I sent patch for abuild to alpine-devel ML before sending this one. Jirutka applied it there, but with some changes. Therefore this patch is obviously no longer the same as the one in upstream. > > > +diff --git a/abuild.in b/abuild.in > > +index e49956b76d04..f56ac033f6a9 100644 > > +--- a/abuild.in > > ++++ b/abuild.in > > +@@ -565,10 +565,10 @@ have_patches() { > > + > > + default_prepare() { > > + local i > > ++ cd "$builddir" || { error "Is \$builddir set correctly?"; > > return 1; } > > + if ! have_patches; then > > + return 0 > > + fi > > +- cd "$builddir" || { error "Is \$builddir set correctly?"; > > return 1; } > > + for i in $source; do > > + case $i in > > + *.patch) > > The problem with this is that not abuild's are updated yet to define > $builddir. This would make those fail. If it tries to cd there by > default, it should at least check that $builddir is defined. builddir is defined thanks to commit 4f37c8efd306: abuild: set default builddir when not defined in APKBUILD that became part of abuild v2.29.0, which is in aports already. Fail would be if [ "$_builddir" != "$srcdir/$pkgname-$pkgver" ]. I haven't grepped if there are such cases, though. > > This was the logic for cd:ing $builddir: > - since not all (yet) set $builddir, don't do it by default > - the abuilds that use $_builddir and have patches, should ship their > own prepare() so it's assumed that having patches and getting to > default_prepare the variable name has been fixed too > > I'd be ok, if in "if ! have_patches" we check if $builddir is set and > cd to it. Do you still think that further changes are needed in abuild.git? > Thanks, > Timo Regards, Przemek --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
---- On Thu, 08 Dec 2016 23:19:51 +0100 Przemysław Pawełczyk <przemoc@zoho.com> wrote ---- > ---- On Wed, 07 Dec 2016 09:04:13 +0100 Timo Teras <timo.teras@iki.fi> wrote ---- > > On Sat, 3 Dec 2016 20:06:16 +0100 > > Przemyslaw Pawelczyk <przemoc@zoho.com> wrote: > > > > > ...-default_prepare-always-end-up-in-builddi.patch | 30 > > > ++++++++++++++++++++++ > > > main/abuild/APKBUILD | 12 ++++++--- 2 > > > files changed, 38 insertions(+), 4 deletions(-) create mode 100644 > > > main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch > > > > We generally want abuild patches to first go to abuild.git. > > I sent patch for abuild to alpine-devel ML before sending this one. > Jirutka applied it there, but with some changes. > Therefore this patch is obviously no longer the same as the one in upstream. > > > > > > +diff --git a/abuild.in b/abuild.in > > > +index e49956b76d04..f56ac033f6a9 100644 > > > +--- a/abuild.in > > > ++++ b/abuild.in > > > +@@ -565,10 +565,10 @@ have_patches() { > > > + > > > + default_prepare() { > > > + local i > > > ++ cd "$builddir" || { error "Is \$builddir set correctly?"; > > > return 1; } > > > + if ! have_patches; then > > > + return 0 > > > + fi > > > +- cd "$builddir" || { error "Is \$builddir set correctly?"; > > > return 1; } > > > + for i in $source; do > > > + case $i in > > > + *.patch) > > > > The problem with this is that not abuild's are updated yet to define > > $builddir. This would make those fail. If it tries to cd there by > > default, it should at least check that $builddir is defined. > > builddir is defined thanks to commit 4f37c8efd306: > > abuild: set default builddir when not defined in APKBUILD > > that became part of abuild v2.29.0, which is in aports already. > > Fail would be if [ "$_builddir" != "$srcdir/$pkgname-$pkgver" ]. > I haven't grepped if there are such cases, though. Sure there are... Assuming that every package with _builddir started using default_prepare() w/o providing proper builddir variable, out of 2266 cases only ~787 would work out-of-the-box. Stats are below. What a mess it is... There is severe lack of consistency in naming. I'm starting to think, that it would be desirable to introduce official variables like below: - srcprefix=${srcprefix:-} - srcname=${srcname:-$pkgname} - srcnvsep=${srcnvsep:--} - srcver=${srcver:-$pkgver} - srcsuffix=${srcsuffix:-} - srcfullname=${srcfullname:-$srcprefix$srcname$srcnvsep$srcver$srcsuffix} Packagers should provide them for defining non-standard directory names (instead of whatever name they like). builddir then should be defined as: builddir=${builddir:-$srcdir/$srcfullname} That way we'll be able to cover 99,9% cases (or maybe even all) and only rest of them will need to provide their own builddir (which will be very very rare, and it is a good thing). Ultimately builddir definition could almost entirely vanish from APKBUILDs. $ git grep -h '^_builddir=' master -- main/ community/ testing/ | sort | uniq -c | sort -rn 452 _builddir="$srcdir"/$pkgname-$pkgver 347 _builddir="$srcdir/$_pkgreal-$pkgver" 346 _builddir="$srcdir"/$_pkgname-$pkgver 251 _builddir="$srcdir/$pkgname-$pkgver" 40 _builddir="${srcdir}/${pkgname}-${pkgver}" 31 _builddir="$srcdir/$_realname-$pkgver" 21 _builddir="$srcdir"/$_realname-$pkgver 14 _builddir="$srcdir" 11 _builddir=${srcdir}/${pkgname}-${pkgver} 11 _builddir="$srcdir"/$_pkgreal-$pkgver 10 _builddir=$srcdir/$pkgname-$pkgver 10 _builddir="$srcdir"/$pkgname-$_ver 9 _builddir="$srcdir"/$_realname 8 _builddir= 7 _builddir="$srcdir"/${pkgname}-${pkgver} 6 _builddir="${srcdir}/build" 6 _builddir="$srcdir"/$pkgname 6 _builddir="$srcdir"/$_pkgreal-$_pkgver 5 _builddir="$srcdir/$pkgname" 5 _builddir="$srcdir"/build 4 _builddir="${srcdir}/${_pkgname}-${pkgver}" 4 _builddir="$srcdir/${pkgname}-${pkgver}" 4 _builddir="$srcdir"/${_realpkgname}-$pkgver 4 _builddir="$srcdir"/$pkgname-$_realver 4 _builddir="$srcdir"/$pkgname-$_pkgver 3 _builddir="${srcdir}"/$pkgname-$pkgver 3 _builddir="$srcdir"/$pkgname-$pkgver-stable 3 _builddir="$srcdir"/$pkgname-$_myver 3 _builddir="$srcdir"/"$_pkgname"-$pkgver 2 _builddir=${srcdir}/${_pkgname}-${pkgver} 2 _builddir="${srcdir}"/${pkgname}-${pkgver} 2 _builddir="$srcdir/ipfw3-2012" 2 _builddir="$srcdir/gtksourceview-$pkgver" 2 _builddir="$srcdir/$pkgname-$_ver" 2 _builddir="$srcdir/$pkgname-$_pkgver" 2 _builddir="$srcdir"/python-$_pkgname-$pkgver 2 _builddir="$srcdir"/pygobject-$pkgver 2 _builddir="$srcdir"/gstreamer-$pkgver 2 _builddir="$srcdir"/gst-plugins-ugly-$pkgver 2 _builddir="$srcdir"/gst-plugins-good-$pkgver 2 _builddir="$srcdir"/gst-plugins-base-$pkgver 2 _builddir="$srcdir"/gdnsd-$pkgver 2 _builddir="$srcdir"/farstream-$pkgver 2 _builddir="$srcdir"/Penlight-$pkgver 2 _builddir="$srcdir"/$pkgname-$pkgname-$pkgver 2 _builddir="$srcdir"/"$pkgname-$pkgver" 1 _builddir=${srcdir}/${pkgname}-master 1 _builddir=${srcdir}/${pkgname}-${pkgname}-${pkgver} 1 _builddir=$srcdir/sorl-thumbnail-$pkgver 1 _builddir=$srcdir/lua-sleep_$pkgver 1 _builddir=$srcdir/lua-signal 1 _builddir=$srcdir/ipset-$pkgver 1 _builddir=$srcdir/factory_boy-$pkgver 1 _builddir=$srcdir/django_compressor-$pkgver 1 _builddir=$srcdir/django-widget-tweaks-$pkgver 1 _builddir=$srcdir/django-treebeard-$pkgver 1 _builddir=$srcdir/django-tables2-$pkgver 1 _builddir=$srcdir/django-oscar-$pkgver 1 _builddir=$srcdir/django-haystack-$pkgver 1 _builddir=$srcdir/django-extra-views-$pkgver 1 _builddir=$srcdir/django-contact-form-$pkgver 1 _builddir=$srcdir/django-appconf-$pkgver 1 _builddir=$srcdir/awall-$pkgver 1 _builddir=$srcdir/ZoneMinder-$pkgver 1 _builddir=$srcdir/LuaJIT-$_realver 1 _builddir=$srcdir/${pkgname}-${pkgver} 1 _builddir=$srcdir/${_pkgreal}_${pkgver} 1 _builddir=$srcdir/$pkgname-$pkgname-$pkgver 1 _builddir=$srcdir/$pkgname 1 _builddir=$srcdir/$_usname-$pkgver 1 _builddir=$srcdir/$_usname-$_usver-$_usrel 1 _builddir=$srcdir/$_realname-$pkgver 1 _builddir="${srcdir}/ubuntu-font-family-${pkgver}" 1 _builddir="${srcdir}/murrine-${pkgver}" 1 _builddir="${srcdir}/mpt-status-${pkgver}" 1 _builddir="${srcdir}/firefox-${pkgver}esr" 1 _builddir="${srcdir}/djblets-release-${pkgver}" 1 _builddir="${srcdir}/boost-coroutine" 1 _builddir="${srcdir}/autoconf-${pkgver}" 1 _builddir="${srcdir}/PyQt-x11-gpl-${pkgver}" 1 _builddir="${srcdir}/ORBit2-${pkgver}" 1 _builddir="${srcdir}/GConf-${pkgver}" 1 _builddir="${srcdir}/${pkgname}-${pkgver}-server" 1 _builddir="${srcdir}/${pkgname}" 1 _builddir="${srcdir}/${_pkgname}-$pkgver" 1 _builddir="${srcdir}/$pkgname-$pkgver" 1 _builddir="${srcdir}"/"${pkgname}"-"${pkgver}" 1 _builddir="$srcdir/zlib-$pkgver"/contrib/minizip 1 _builddir="$srcdir/unixODBC-$pkgver" 1 _builddir="$srcdir/ufsutils-$pkgver" 1 _builddir="$srcdir/ufpdf/ttf2ufm-src" 1 _builddir="$srcdir/turbo-$pkgver" 1 _builddir="$srcdir/tls${pkgver}" 1 _builddir="$srcdir/tg-$pkgver" 1 _builddir="$srcdir/squashfs$pkgver/$pkgname" 1 _builddir="$srcdir/sqm-scripts-$pkgver" 1 _builddir="$srcdir/password-store-$pkgver" 1 _builddir="$srcdir/open-vm-tools-stable-$_ver"/open-vm-tools 1 _builddir="$srcdir/netcf-$pkgver" 1 _builddir="$srcdir/mesa-$pkgver" 1 _builddir="$srcdir/libotr-$pkgver" 1 _builddir="$srcdir/libXxf86misc-$pkgver" 1 _builddir="$srcdir/libXft-$pkgver" 1 _builddir="$srcdir/libXdmcp-$pkgver" 1 _builddir="$srcdir/libXdamage-$pkgver" 1 _builddir="$srcdir/libICE-$pkgver" 1 _builddir="$srcdir/gst-plugins-bad-$pkgver" 1 _builddir="$srcdir/gradm" 1 _builddir="$srcdir/go/src/github.com/progrium/$pkgname" 1 _builddir="$srcdir/gnupg-$pkgver" 1 _builddir="$srcdir/gevent-websocket-$pkgver" 1 _builddir="$srcdir/galculator-$pkgver" 1 _builddir="$srcdir/freefont-$pkgver" 1 _builddir="$srcdir/dwarf-$pkgver" 1 _builddir="$srcdir/drupal-$pkgver" 1 _builddir="$srcdir/distribution-$pkgver" 1 _builddir="$srcdir/db-$_ver" 1 _builddir="$srcdir/cdparanoia-III-$pkgver" 1 _builddir="$srcdir/bitlbee-facebook-${pkgver}" 1 _builddir="$srcdir/bind-${_ver}" 1 _builddir="$srcdir/LucenePlusPlus-rel_$pkgver" 1 _builddir="$srcdir/${pkgname}-${_pkgver}" 1 _builddir="$srcdir/${pkgname}-$pkgver" 1 _builddir="$srcdir/${pkgname}-$_ver" 1 _builddir="$srcdir/${pkgname}${pkgver}" 1 _builddir="$srcdir/$pkgname-snapshot-$pkgver-2245-stable" 1 _builddir="$srcdir/$pkgname-RELEASE-$_ver" 1 _builddir="$srcdir/$pkgname-${pkgver/_/-}" 1 _builddir="$srcdir/$pkgname-$pkgver/" 1 _builddir="$srcdir/$pkgname-$pkgver.orig" 1 _builddir="$srcdir/$pkgname-$pkgver-fixed" 1 _builddir="$srcdir/$pkgname-$pkgver-ac20050924p1" 1 _builddir="$srcdir/$pkgname-$pkgver$_versuffix" 1 _builddir="$srcdir/$pkgname-$pkgname-$pkgver" 1 _builddir="$srcdir/$pkgname-$_sha" 1 _builddir="$srcdir/$pkgname-$_pkgcommit" 1 _builddir="$srcdir/$pkgname-$_myver" 1 _builddir="$srcdir/$pkgname-$_date" 1 _builddir="$srcdir/$_realname-v$pkgver" 1 _builddir="$srcdir/$_realname-$_realver" 1 _builddir="$srcdir/$_pkgverstr" 1 _builddir="$srcdir/$_pkgreal-v$pkgver" 1 _builddir="$srcdir/$_name-$pkgver" 1 _builddir="$srcdir/$_hgrepo" 1 _builddir="$srcdir/$_basename-mr$pkgver" 1 _builddir="$srcdir/" 1 _builddir="$srcdir"/zope.event-$pkgver 1 _builddir="$srcdir"/znc-$pkgver 1 _builddir="$srcdir"/zd1211-firmware 1 _builddir="$srcdir"/yajl-$pkgver 1 _builddir="$srcdir"/xprop-$pkgver 1 _builddir="$srcdir"/xmltv-$pkgver 1 _builddir="$srcdir"/xmlindent-$pkgver 1 _builddir="$srcdir"/xfce4-whiskermenu-plugin-$pkgver 1 _builddir="$srcdir"/xfce4-volumed-$pkgver 1 _builddir="$srcdir"/xfce4-terminal-$pkgver 1 _builddir="$srcdir"/xfce4-power-manager-$pkgver 1 _builddir="$srcdir"/xfce4-cpugraph-plugin-$pkgver 1 _builddir="$srcdir"/xfce4-clipman-plugin-$pkgver 1 _builddir="$srcdir"/xf86-video-vmware-$pkgver 1 _builddir="$srcdir"/xf86-video-qxl-$pkgver 1 _builddir="$srcdir"/xctrl-$pkgver 1 _builddir="$srcdir"/xcb-util-wm-$pkgver 1 _builddir="$srcdir"/xcb-util-renderutil-$pkgver 1 _builddir="$srcdir"/xcb-util-keysyms-$pkgver 1 _builddir="$srcdir"/xcb-util-image-$pkgver 1 _builddir="$srcdir"/xcb-util-cursor-$pkgver 1 _builddir="$srcdir"/xcache-$pkgver 1 _builddir="$srcdir"/x265_$pkgver 1 _builddir="$srcdir"/wxPython-src-$pkgver 1 _builddir="$srcdir"/wkhtmltopdf-$pkgver 1 _builddir="$srcdir"/wireless_tools.30 1 _builddir="$srcdir"/websocketpp-$pkgver 1 _builddir="$srcdir"/watchdog-$pkgver 1 _builddir="$srcdir"/vte-$pkgver 1 _builddir="$srcdir"/vnc2flv-$pkgver 1 _builddir="$srcdir"/v86d-86d-$pkgver 1 _builddir="$srcdir"/uuid 1 _builddir="$srcdir"/usbredir-$pkgver 1 _builddir="$srcdir"/urlgrabber-$pkgver 1 _builddir="$srcdir"/umix-$pkgver 1 _builddir="$srcdir"/uhttpmock-$pkgver 1 _builddir="$srcdir"/udisks-$pkgver 1 _builddir="$srcdir"/udev-init-scripts-$pkgver 1 _builddir="$srcdir"/uClibc-${_ver} 1 _builddir="$srcdir"/tumbler-$pkgver 1 _builddir="$srcdir"/tomahawk-$pkgver 1 _builddir="$srcdir"/toluapp-$pkgver 1 _builddir="$srcdir"/tinycss-$pkgver 1 _builddir="$srcdir"/thunar-vcs-plugin-$pkgver 1 _builddir="$srcdir"/tevent-$pkgver 1 _builddir="$srcdir"/tdb-$pkgver 1 _builddir="$srcdir"/tcl${pkgver}/unix 1 _builddir="$srcdir"/task-$pkgver 1 _builddir="$srcdir"/sword-$pkgver 1 _builddir="$srcdir"/subunit-$pkgver 1 _builddir="$srcdir"/su-exec-$pkgver 1 _builddir="$srcdir"/stfl-$pkgver 1 _builddir="$srcdir"/sshpass-$pkgver 1 _builddir="$srcdir"/sshguard-$pkgver 1 _builddir="$srcdir"/sphinx-autobuild-$pkgver 1 _builddir="$srcdir"/sparsehash-sparsehash-$pkgver 1 _builddir="$srcdir"/soundtouch 1 _builddir="$srcdir"/sng-tc-linux-$pkgver.i686 1 _builddir="$srcdir"/snappy-$pkgver 1 _builddir="$srcdir"/smem-$pkgver 1 _builddir="$srcdir"/sfic-$pkgver 1 _builddir="$srcdir"/ser2net-$pkgver 1 _builddir="$srcdir"/sdparm-$pkgver 1 _builddir="$srcdir"/scipy-$pkgver 1 _builddir="$srcdir"/sch_cake-$_gitver 1 _builddir="$srcdir"/samba-$pkgver 1 _builddir="$srcdir"/rsnapshot-$pkgver 1 _builddir="$srcdir"/robm-$pkgname-$_pkgver 1 _builddir="$srcdir"/rethinkdb-$pkgver 1 _builddir="$srcdir"/rest-$pkgver 1 _builddir="$srcdir"/remind-$pkgver 1 _builddir="$srcdir"/redland-$pkgver 1 _builddir="$srcdir"/rasqal-$pkgver 1 _builddir="$srcdir"/raptor2-$pkgver 1 _builddir="$srcdir"/rancid-$pkgver 1 _builddir="$srcdir"/ragel-$pkgver 1 _builddir="$srcdir"/quvi-$pkgver 1 _builddir="$srcdir"/quazip-$pkgver 1 _builddir="$srcdir"/qtxmlpatterns-opensource-src-$_V 1 _builddir="$srcdir"/qttranslations-opensource-src-$_V 1 _builddir="$srcdir"/qttools-opensource-src-$_V 1 _builddir="$srcdir"/qtsvg-opensource-src-$_V 1 _builddir="$srcdir"/qtscript-opensource-src-$_V 1 _builddir="$srcdir"/qtquickcontrols-opensource-src-$_V 1 _builddir="$srcdir"/qtmultimedia-opensource-src-${_V%-*} 1 _builddir="$srcdir"/qtimageformats-opensource-src-$_V 1 _builddir="$srcdir"/qtgraphicaleffects-opensource-src-$_V 1 _builddir="$srcdir"/qtdeclarative-opensource-src-${_V%-*} 1 _builddir="$srcdir"/qt-everywhere-opensource-src-$pkgver 1 _builddir="$srcdir"/qt-creator-opensource-src-$pkgver 1 _builddir="$srcdir"/qrencode-$pkgver 1 _builddir="$srcdir"/qpdf-$pkgver 1 _builddir="$srcdir"/python2-pythondialog-$pkgver 1 _builddir="$srcdir"/python-livereload-$pkgver 1 _builddir="$srcdir"/python-gflags-$pkgver 1 _builddir="$srcdir"/python-distutils-extra-$pkgver 1 _builddir="$srcdir"/pylast-$pkgver 1 _builddir="$srcdir"/pygtk-$pkgver 1 _builddir="$srcdir"/pygraphviz-pygraphviz-$_ver 1 _builddir="$srcdir"/putty-$pkgver 1 _builddir="$srcdir"/procmail-$pkgver 1 _builddir="$srcdir"/powertop-$pkgver 1 _builddir="$srcdir"/postfixadmin-$pkgver 1 _builddir="$srcdir"/portaudio 1 _builddir="$srcdir"/polkit-$pkgver 1 _builddir="$srcdir"/pngquant-$pkgver 1 _builddir="$srcdir"/pllua-$pkgver 1 _builddir="$srcdir"/pigz-$pkgver 1 _builddir="$srcdir"/pidgin-sipe-$pkgver 1 _builddir="$srcdir"/pianobar-$pkgver 1 _builddir="$srcdir"/phonon-$pkgver 1 _builddir="$srcdir"/phodav-$pkgver 1 _builddir="$srcdir"/patchutils-$pkgver 1 _builddir="$srcdir"/passlib-$pkgver 1 _builddir="$srcdir"/parsedatetime-$pkgver 1 _builddir="$srcdir"/pangox-compat-$pkgver 1 _builddir="$srcdir"/pam-pgsql-$pkgver 1 _builddir="$srcdir"/pacman-$pkgver 1 _builddir="$srcdir"/ortp-$pkgver 1 _builddir="$srcdir"/orc-$pkgver 1 _builddir="$srcdir"/opus-$pkgver 1 _builddir="$srcdir"/openobex-$pkgver-Source 1 _builddir="$srcdir"/openbox-$pkgver 1 _builddir="$srcdir"/nss-pam-ldapd-$pkgver 1 _builddir="$srcdir"/npth-$pkgver 1 _builddir="$srcdir"/npapi-sdk-$pkgver 1 _builddir="$srcdir"/nikola-$pkgver 1 _builddir="$srcdir"/newsbeuter-$pkgver 1 _builddir="$srcdir"/net-tools-$_ver 1 _builddir="$srcdir"/ndg_httpsclient-$pkgver 1 _builddir="$srcdir"/ncurses-$pkgver 1 _builddir="$srcdir"/mxml-$pkgver 1 _builddir="$srcdir"/musicbrainzngs-$pkgver 1 _builddir="$srcdir"/mtdev-$pkgver 1 _builddir="$srcdir"/mqtt-exec-$pkgver 1 _builddir="$srcdir"/mpdscribble-$pkgver 1 _builddir="$srcdir"/mpc-$pkgver 1 _builddir="$srcdir"/mono-${pkgver%.*} 1 _builddir="$srcdir"/mongo-tools-$pkgver 1 _builddir="$srcdir"/miniupnpd-$pkgver 1 _builddir="$srcdir"/meep-$pkgver 1 _builddir="$srcdir"/makekit-release-$pkgver/build 1 _builddir="$srcdir"/mailx-$pkgver 1 _builddir="$srcdir"/lxsession-$pkgver 1 _builddir="$srcdir"/lxpolkit-$pkgver 1 _builddir="$srcdir"/luasoap-$_pkgver 1 _builddir="$srcdir"/luasec-luasec-$pkgver 1 _builddir="$srcdir"/luaexpat-1.3.0 1 _builddir="$srcdir"/luacrypto-$pkgver 1 _builddir="$srcdir"/lua-stringy-$pkgver/stringy 1 _builddir="$srcdir"/lua-optarg-$pkgver 1 _builddir="$srcdir"/lua-mqtt-publish-$pkgver 1 _builddir="$srcdir"/lua-maxminddb-$pkgver 1 _builddir="$srcdir"/lua-hiredis-$pkgver 1 _builddir="$srcdir"/lua-file-magic-$pkgver 1 _builddir="$srcdir"/lua-feedparser-$pkgver 1 _builddir="$srcdir"/lua-compat-5.2-bitlib-$pkgver 1 _builddir="$srcdir"/lua-b64-$pkgver 1 _builddir="$srcdir"/lua-aports-$pkgver 1 _builddir="$srcdir"/lua-$pkgver 1 _builddir="$srcdir"/lua-$_ver 1 _builddir="$srcdir"/lsyncd-$pkgver 1 _builddir="$srcdir"/lrexlib-rel-${pkgver//./-} 1 _builddir="$srcdir"/logilab-astng-$pkgver 1 _builddir="$srcdir"/lockfile-progs-$pkgver 1 _builddir="$srcdir"/lksctp-tools-$pkgver 1 _builddir="$srcdir"/lizardfs-$pkgver 1 _builddir="$srcdir"/live 1 _builddir="$srcdir"/linuxconsoletools-$pkgver 1 _builddir="$srcdir"/linenoise-$pkgver 1 _builddir="$srcdir"/lightdm-$pkgver 1 _builddir="$srcdir"/libxshmfence-$pkgver 1 _builddir="$srcdir"/libxkbcommon-$pkgver 1 _builddir="$srcdir"/libwpg-$pkgver 1 _builddir="$srcdir"/libwpd-$pkgver 1 _builddir="$srcdir"/libvncserver-LibVNCServer-$pkgver 1 _builddir="$srcdir"/libvirt-glib-$pkgver 1 _builddir="$srcdir"/libverto-$pkgver 1 _builddir="$srcdir"/libva-$pkgver 1 _builddir="$srcdir"/libunistring-$pkgver 1 _builddir="$srcdir"/libunique-$pkgver 1 _builddir="$srcdir"/libtxc_dxtn-$pkgver 1 _builddir="$srcdir"/libssh2-$pkgver 1 _builddir="$srcdir"/libsigsegv-$pkgver 1 _builddir="$srcdir"/libshairport-$_realver 1 _builddir="$srcdir"/libsecret-$pkgver 1 _builddir="$srcdir"/libseccomp-$pkgver 1 _builddir="$srcdir"/libreoffice-$pkgver 1 _builddir="$srcdir"/libquvi-scripts-$pkgver 1 _builddir="$srcdir"/libquvi-$pkgver 1 _builddir="$srcdir"/libproxy-$pkgver 1 _builddir="$srcdir"/libpgm-$pkgver/openpgm/pgm/ 1 _builddir="$srcdir"/libosinfo-$pkgver 1 _builddir="$srcdir"/libnl-$pkgver 1 _builddir="$srcdir"/libnjb-$pkgver 1 _builddir="$srcdir"/libnice-$pkgver 1 _builddir="$srcdir"/libnfsidmap-$pkgver 1 _builddir="$srcdir"/libnfs-libnfs-$pkgver 1 _builddir="$srcdir"/libnetfilter_queue-$pkgver 1 _builddir="$srcdir"/libnetfilter_cttimeout-$pkgver 1 _builddir="$srcdir"/libnetfilter_cthelper-$pkgver 1 _builddir="$srcdir"/libmwaw-$pkgver 1 _builddir="$srcdir"/libmspack-$_ver 1 _builddir="$srcdir"/libmp3splt-$pkgver 1 _builddir="$srcdir"/libmowgli-2-$pkgname-$pkgver 1 _builddir="$srcdir"/libmemcached-$pkgver 1 _builddir="$srcdir"/libjpeg-turbo-$pkgver 1 _builddir="$srcdir"/libiec61883-$pkgver 1 _builddir="$srcdir"/libgdiplus-$pkgver 1 _builddir="$srcdir"/libfprint-$pkgver 1 _builddir="$srcdir"/libepoxy-$pkgver 1 _builddir="$srcdir"/libedit-$_ver 1 _builddir="$srcdir"/libechonest-$pkgver 1 _builddir="$srcdir"/libdvdread-$pkgver 1 _builddir="$srcdir"/libdvdnav-$pkgver 1 _builddir="$srcdir"/libdvbcsa-$pkgver 1 _builddir="$srcdir"/libdv-$pkgver 1 _builddir="$srcdir"/libdc1394-$pkgver 1 _builddir="$srcdir"/libctl-$pkgver 1 _builddir="$srcdir"/libcec-libcec-$pkgver 1 _builddir="$srcdir"/libcdio-paranoia-10.2+$_ver 1 _builddir="$srcdir"/libbluray-$pkgver 1 _builddir="$srcdir"/libavc1394-$pkgver 1 _builddir="$srcdir"/libart_lgpl-$pkgver 1 _builddir="$srcdir"/libantlr3c-$pkgver 1 _builddir="$srcdir"/libXxf86vm-$pkgver 1 _builddir="$srcdir"/libXxf86dga-$pkgver 1 _builddir="$srcdir"/libXt-$pkgver 1 _builddir="$srcdir"/libXres-$pkgver 1 _builddir="$srcdir"/libXp-$pkgver 1 _builddir="$srcdir"/libXinerama-$pkgver 1 _builddir="$srcdir"/libXext-$pkgver 1 _builddir="$srcdir"/libXcursor-$pkgver 1 _builddir="$srcdir"/libXcomposite-$pkgver 1 _builddir="$srcdir"/libXaw-$pkgver 1 _builddir="$srcdir"/libXScrnSaver-$pkgver 1 _builddir="$srcdir"/libIDL-$pkgver 1 _builddir="$srcdir"/leveldb-$pkgver 1 _builddir="$srcdir"/leptonica-$pkgver 1 _builddir="$srcdir"/ldns-$pkgver 1 _builddir="$srcdir"/lddtree-$pkgver 1 _builddir="$srcdir"/ldbus-$_commitid/src 1 _builddir="$srcdir"/ldb-$pkgver 1 _builddir="$srcdir"/lcms2-$pkgver 1 _builddir="$srcdir"/krb5-$pkgver 1 _builddir="$srcdir"/kmod-$pkgver 1 _builddir="$srcdir"/keyutils-$pkgver 1 _builddir="$srcdir"/keybinder-$pkgver 1 _builddir="$srcdir"/kbd-$pkgver 1 _builddir="$srcdir"/kBuild-$_ver 1 _builddir="$srcdir"/jsoncpp-$pkgver 1 _builddir="$srcdir"/json4lua-$pkgver 1 _builddir="$srcdir"/json-c-$pkgver 1 _builddir="$srcdir"/jellyfish-$pkgver 1 _builddir="$srcdir"/jack-$pkgver 1 _builddir="$srcdir"/itstool-$pkgver 1 _builddir="$srcdir"/iptraf-ng-$pkgver 1 _builddir="$srcdir"/ipt-netflow-$_ver 1 _builddir="$srcdir"/iniparser-$pkgver 1 _builddir="$srcdir"/incron-$pkgver 1 _builddir="$srcdir"/ilbc-$pkgver 1 _builddir="$srcdir"/iftop-$pkgver 1 _builddir="$srcdir"/icu/source 1 _builddir="$srcdir"/icedtea-web-$pkgver 1 _builddir="$srcdir"/hypermail 1 _builddir="$srcdir"/hydrogen-$pkgver 1 _builddir="$srcdir"/hwdata-$pkgver 1 _builddir="$srcdir"/hunspell-pt_PT-$pkgver 1 _builddir="$srcdir"/highlight-$pkgver 1 _builddir="$srcdir"/hexchat-$pkgver 1 _builddir="$srcdir"/help2man-$pkgver 1 _builddir="$srcdir"/hdf5-$_pkgver 1 _builddir="$srcdir"/hashids.lua-$pkgver 1 _builddir="$srcdir"/harminv-$pkgver 1 _builddir="$srcdir"/guvcview-src-$pkgver 1 _builddir="$srcdir"/gutenprint-$pkgver 1 _builddir="$srcdir"/gtk+-$pkgver 1 _builddir="$srcdir"/gst-plugins-bad-$pkgver 1 _builddir="$srcdir"/gst-libav-$pkgver 1 _builddir="$srcdir"/gst-ffmpeg-$pkgver 1 _builddir="$srcdir"/gss-$pkgver 1 _builddir="$srcdir"/gsm-${pkgver%.*}-pl${pkgver##*.} 1 _builddir="$srcdir"/gsettings-desktop-schemas-$pkgver 1 _builddir="$srcdir"/gptfdisk-$pkgver 1 _builddir="$srcdir"/gphoto2-$pkgver 1 _builddir="$srcdir"/gpgme-$pkgver 1 _builddir="$srcdir"/googletest-release-${pkgver} 1 _builddir="$srcdir"/gnuchess-$pkgver 1 _builddir="$srcdir"/gnome-icon-theme-symbolic-$pkgver 1 _builddir="$srcdir"/gnome-common-$pkgver 1 _builddir="$srcdir"/gnomad2-$pkgver 1 _builddir="$srcdir"/gmp-${pkgver%[a-z]} 1 _builddir="$srcdir"/glu-$pkgver 1 _builddir="$srcdir"/glm 1 _builddir="$srcdir"/glamor-egl-$pkgver 1 _builddir="$srcdir"/gifsicle-$pkgver 1 _builddir="$srcdir"/gengetopt-$pkgver 1 _builddir="$srcdir"/gdbm-$pkgver 1 _builddir="$srcdir"/gcr-$pkgver 1 _builddir="$srcdir"/gc-${pkgver%[a-z]} 1 _builddir="$srcdir"/gapk-$pkgver 1 _builddir="$srcdir"/fwknop-$pkgver 1 _builddir="$srcdir"/fuse-exfat-$pkgver 1 _builddir="$srcdir"/flite-$pkgver-release 1 _builddir="$srcdir"/flask-paginate-$pkgver 1 _builddir="$srcdir"/flashcache-$pkgver 1 _builddir="$srcdir"/findutils-$pkgver 1 _builddir="$srcdir"/ffmpeg-$pkgver 1 _builddir="$srcdir"/ffcall-$pkgver 1 _builddir="$srcdir"/f2fs-tools-$pkgver 1 _builddir="$srcdir"/exo-$pkgver 1 _builddir="$srcdir"/email2trac-$pkgver 1 _builddir="$srcdir"/ediarpc-$pkgver 1 _builddir="$srcdir"/drizzle7-$pkgver 1 _builddir="$srcdir"/docbook2X-$pkgver 1 _builddir="$srcdir"/django-suit-$pkgver 1 _builddir="$srcdir"/discogs-client-$pkgver 1 _builddir="$srcdir"/dia-$pkgver 1 _builddir="$srcdir"/dhcpcd-ui-$pkgver 1 _builddir="$srcdir"/devicemaster-linux-$pkgver 1 _builddir="$srcdir"/dev86-$pkgver 1 _builddir="$srcdir"/dejagnu-$pkgver 1 _builddir="$srcdir"/dbus-python-$pkgver 1 _builddir="$srcdir"/daq-$pkgver 1 _builddir="$srcdir"/dansguardian-$pkgver 1 _builddir="$srcdir"/d-feet-$pkgver 1 _builddir="$srcdir"/cups-filters-$pkgver 1 _builddir="$srcdir"/cpulimit-$pkgver 1 _builddir="$srcdir"/cppunit-$pkgver 1 _builddir="$srcdir"/connman-$pkgver 1 _builddir="$srcdir"/cogl-$pkgver 1 _builddir="$srcdir"/clucene-core-$pkgver 1 _builddir="$srcdir"/chrpath-$pkgver 1 _builddir="$srcdir"/cfengine-${pkgver%_p*} 1 _builddir="$srcdir"/celt-$pkgver 1 _builddir="$srcdir"/cairocffi-$pkgver 1 _builddir="$srcdir"/brlaser-$pkgver 1 _builddir="$srcdir"/bitchx-$pkgver 1 _builddir="$srcdir"/beets-$pkgver 1 _builddir="$srcdir"/bdr-$pkgver 1 _builddir="$srcdir"/bcache-tools-$pkgver 1 _builddir="$srcdir"/b43-fwcutter-$pkgver 1 _builddir="$srcdir"/axel-$pkgver 1 _builddir="$srcdir"/avahi-$pkgver 1 _builddir="$srcdir"/automoc4-$pkgver 1 _builddir="$srcdir"/aumix-$pkgver 1 _builddir="$srcdir"/audioread-$pkgver 1 _builddir="$srcdir"/audacity-Audacity-$pkgver 1 _builddir="$srcdir"/attica-$pkgver 1 _builddir="$srcdir"/at-spi2-core-$pkgver 1 _builddir="$srcdir"/at-spi2-atk-$pkgver 1 _builddir="$srcdir"/aspell6-uk-$pkgver-0 1 _builddir="$srcdir"/aspell6-ru-$pkgver-1 1 _builddir="$srcdir"/aspell6-de-$pkgver-1 1 _builddir="$srcdir"/aspell-fr-$_ver 1 _builddir="$srcdir"/asio-$pkgver 1 _builddir="$srcdir"/appstream-glib-$pkgver 1 _builddir="$srcdir"/alt-getopt-$pkgver 1 _builddir="$srcdir"/afpfs-ng-$pkgver 1 _builddir="$srcdir"/adwaita-icon-theme-$pkgver 1 _builddir="$srcdir"/accountsservice-$pkgver 1 _builddir="$srcdir"/a52dec-$pkgver 1 _builddir="$srcdir"/ZendFramework-$pkgver 1 _builddir="$srcdir"/XML-SAX-Base-$pkgver 1 _builddir="$srcdir"/XML-SAX-$pkgver 1 _builddir="$srcdir"/XML-NamespaceSupport-$pkgver 1 _builddir="$srcdir"/WWW-RobotRules-$pkgver 1 _builddir="$srcdir"/VirtualBox-$pkgver 1 _builddir="$srcdir"/Ver$pkgver 1 _builddir="$srcdir"/UNIVERSAL-require-$pkgver 1 _builddir="$srcdir"/Thunar-$pkgver 1 _builddir="$srcdir"/Text-Template-$pkgver 1 _builddir="$srcdir"/Text-Reform-$pkgver 1 _builddir="$srcdir"/Text-Quoted-$pkgver 1 _builddir="$srcdir"/Text-Password-Pronounceable-$pkgver 1 _builddir="$srcdir"/Text-CSV-$pkgver 1 _builddir="$srcdir"/Text-Autoformat-$pkgver 1 _builddir="$srcdir"/Test-SharedFork-$pkgver 1 _builddir="$srcdir"/Test-NoWarnings-$pkgver 1 _builddir="$srcdir"/Test-LongString-$pkgver 1 _builddir="$srcdir"/Test-Deep-$pkgver 1 _builddir="$srcdir"/Term-ProgressBar-$pkgver 1 _builddir="$srcdir"/Switch-$pkgver 1 _builddir="$srcdir"/Sub-Install-$pkgver 1 _builddir="$srcdir"/Scope-Guard-$pkgver 1 _builddir="$srcdir"/SDL_mixer-$pkgver 1 _builddir="$srcdir"/SDL_image-$pkgver 1 _builddir="$srcdir"/SDL-$pkgver 1 _builddir="$srcdir"/Reusable-Cluster-Components-glue--glue-$pkgver 1 _builddir="$srcdir"/Remmina-$_hash 1 _builddir="$srcdir"/Regexp-IPv6-$pkgver 1 _builddir="$srcdir"/Regexp-Common-net-CIDR-$pkgver 1 _builddir="$srcdir"/Recode-$pkgver 1 _builddir="$srcdir"/Radicale-$pkgver 1 _builddir="$srcdir"/Pyphen-$pkgver 1 _builddir="$srcdir"/Pykka-$pkgver 1 _builddir="$srcdir"/Pound-$pkgver 1 _builddir="$srcdir"/PerlIO-gzip-$pkgver 1 _builddir="$srcdir"/Params-Util-$pkgver 1 _builddir="$srcdir"/OpenIPMI-$pkgver 1 _builddir="$srcdir"/NetworkManager-$pkgver 1 _builddir="$srcdir"/Net-HTTP-$pkgver 1 _builddir="$srcdir"/Net-DNS-Resolver-Programmable-v$pkgver 1 _builddir="$srcdir"/Net-CIDR-$pkgver 1 _builddir="$srcdir"/MySQL-python-$pkgver 1 _builddir="$srcdir"/Mopidy-Spotify-$pkgver 1 _builddir="$srcdir"/Mopidy-Mopify-$pkgver 1 _builddir="$srcdir"/Mopidy-Moped-$pkgver 1 _builddir="$srcdir"/Mopidy-Beets-$pkgver 1 _builddir="$srcdir"/Module-Versions-Report-$pkgver 1 _builddir="$srcdir"/Microlight-$pkgver 1 _builddir="$srcdir"/Math-Round-$pkgver 1 _builddir="$srcdir"/Logbook-$pkgver 1 _builddir="$srcdir"/Locale-Maketext-Lexicon-$pkgver 1 _builddir="$srcdir"/Locale-Maketext-Fuzzy-$pkgver 1 _builddir="$srcdir"/Linux-PAM-$pkgver 1 _builddir="$srcdir"/Lingua-Preferred-$pkgver 1 _builddir="$srcdir"/Lingua-EN-Numbers-Ordinate-$pkgver 1 _builddir="$srcdir"/LDoc-$pkgver 1 _builddir="$srcdir"/Imaging-$pkgver 1 _builddir="$srcdir"/Image-ExifTool-$pkgver 1 _builddir="$srcdir"/IPC-ShareLite-$pkgver 1 _builddir="$srcdir"/IPC-Run3-$pkgver 1 _builddir="$srcdir"/Hash-MultiValue-$pkgver 1 _builddir="$srcdir"/HTTP-Negotiate-$pkgver 1 _builddir="$srcdir"/HTTP-Daemon-$pkgver 1 _builddir="$srcdir"/HTTP-Cookies-$pkgver 1 _builddir="$srcdir"/HTTP-Body-$pkgver 1 _builddir="$srcdir"/HTML-Quoted-$pkgver 1 _builddir="$srcdir"/FreeRDP-$_hash 1 _builddir="$srcdir"/Flask-WeasyPrint-$pkgver 1 _builddir="$srcdir"/Flask-SSLify-$pkgver 1 _builddir="$srcdir"/Flask-SQLAlchemy-$pkgver 1 _builddir="$srcdir"/Flask-Mail-$pkgver 1 _builddir="$srcdir"/Filesys-Notify-Simple-$pkgver 1 _builddir="$srcdir"/File-ShareDir-$pkgver 1 _builddir="$srcdir"/File-Listing-$pkgver 1 _builddir="$srcdir"/FCGI-ProcManager-$pkgver 1 _builddir="$srcdir"/Emby-$pkgver 1 _builddir="$srcdir"/Email-Address-List-$pkgver 1 _builddir="$srcdir"/Email-Address-$pkgver 1 _builddir="$srcdir"/Devel-StackTrace-AsHTML-$pkgver 1 _builddir="$srcdir"/DateTime-Locale-$pkgver 1 _builddir="$srcdir"/DateTime-Format-W3CDTF-$pkgver 1 _builddir="$srcdir"/DateTime-Format-Mail-$pkgver 1 _builddir="$srcdir"/Data-OptList-$pkgver 1 _builddir="$srcdir"/DBIx-DBSchema-$pkgver 1 _builddir="$srcdir"/Convert-UUlib-$pkgver 1 _builddir="$srcdir"/ConsoleKit-$pkgver 1 _builddir="$srcdir"/Clone-$pkgver 1 _builddir="$srcdir"/Class-ReturnValue-$pkgver 1 _builddir="$srcdir"/Class-MethodMaker-$pkgver 1 _builddir="$srcdir"/Class-Inspector-$pkgver 1 _builddir="$srcdir"/Class-Accessor-$pkgver 1 _builddir="$srcdir"/Canary-Stability-$pkgver 1 _builddir="$srcdir"/CairoSVG-$pkgver 1 _builddir="$srcdir"/Cache-Simple-TimedExpiry-$pkgver 1 _builddir="$srcdir"/CSS-Squish-$pkgver 1 _builddir="$srcdir"/CGI-Fast-$pkgver 1 _builddir="$srcdir"/CEGUI-0.6.2 1 _builddir="$srcdir"/ApplianceKit-NG-$pkgver 1 _builddir="$srcdir"/Albatross-$pkgver 1 _builddir="$srcdir"/${pkgname}_${pkgver}/${pkgname}_${pkgver}_src 1 _builddir="$srcdir"/${pkgname}30 1 _builddir="$srcdir"/${pkgname}-fb-${_ver} 1 _builddir="$srcdir"/${pkgname}-${pkgname}_${pkgver} 1 _builddir="$srcdir"/${pkgname}${_v//./-} 1 _builddir="$srcdir"/${pkgname} 1 _builddir="$srcdir"/${_realname}-${_ver} 1 _builddir="$srcdir"/${_pkgreal}-${pkgver} 1 _builddir="$srcdir"/${_pkgname}-${pkgver} 1 _builddir="$srcdir"/$pkgname-v$pkgver 1 _builddir="$srcdir"/$pkgname-src-r$pkgver 1 _builddir="$srcdir"/$pkgname-s$pkgver 1 _builddir="$srcdir"/$pkgname-release-$pkgver 1 _builddir="$srcdir"/$pkgname-mongodb-$mongodb_version 1 _builddir="$srcdir"/$pkgname-autoconf-$pkgver 1 _builddir="$srcdir"/$pkgname-LMDB_$pkgver/libraries/liblmdb 1 _builddir="$srcdir"/$pkgname-B.$pkgver 1 _builddir="$srcdir"/$pkgname-1.3 1 _builddir="$srcdir"/$pkgname-0.0.6 1 _builddir="$srcdir"/$pkgname-$pkgver/src 1 _builddir="$srcdir"/$pkgname-$pkgver/ 1 _builddir="$srcdir"/$pkgname-$pkgver.orig 1 _builddir="$srcdir"/$pkgname-$pkgver-release 1 _builddir="$srcdir"/$pkgname-$pkgver-api 1 _builddir="$srcdir"/$pkgname-$pkgver-Source 1 _builddir="$srcdir"/$pkgname-$pkgver-$_buildnr 1 _builddir="$srcdir"/$pkgname-$_realname-$pkgver 1 _builddir="$srcdir"/$pkgname-$_major 1 _builddir="$srcdir"/$pkgname$pkgver 1 _builddir="$srcdir"/$_realname-server-$pkgver 1 _builddir="$srcdir"/$_realname-fb-$_ver 1 _builddir="$srcdir"/$_pkgname.py-$pkgver 1 _builddir="$srcdir"/$_pkgname-${pkgver}dev 1 _builddir="$srcdir"/$_pkgname-$pkgver.post1 1 _builddir="$srcdir"/$_pkgname-$pkgver-$_pkgsver 1 _builddir="$srcdir"/$_pkgname-$_ver/nxapi 1 _builddir="$srcdir"/$_pkgname-$_pkgver 1 _builddir="$srcdir"/$_opkgname-$pkgver 1 _builddir="$srcdir"/$_name-$pkgver 1 _builddir="$srcdir"/$_fullpkgname 1 _builddir="$srcdir"/ 1 _builddir=""$srcdir/$pkgname-$pkgver"" Discussion about handling _builddir/builddir & co possibly should move to alpine-devel ML. > > > > > This was the logic for cd:ing $builddir: > > - since not all (yet) set $builddir, don't do it by default > > - the abuilds that use $_builddir and have patches, should ship their > > own prepare() so it's assumed that having patches and getting to > > default_prepare the variable name has been fixed too > > > > I'd be ok, if in "if ! have_patches" we check if $builddir is set and > > cd to it. > > Do you still think that further changes are needed in abuild.git? They are needed, but it's a thing for post-3.5-release actions. I'm sorry. I shouldn't have posted the patch for inclusion in aports's abuild that soon w/o properly investigating all the possible repercussions. > > > Thanks, > > Timo > > Regards, > Przemek Regards, Przemek --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/aports/patches/2494/mbox | git am -3Learn more about email & git
--- ...-default_prepare-always-end-up-in-builddi.patch | 30 ++++++++++++++++++++++ main/abuild/APKBUILD | 12 ++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch diff --git a/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch new file mode 100644 index 000000000000..38f8174594bb --- /dev/null +++ b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch @@ -0,0 +1,30 @@ +From d5fd6ff4c997a3b50f78deab7b0f2cd545f8c44f Mon Sep 17 00:00:00 2001 +From: Przemyslaw Pawelczyk <przemoc@zoho.com> +Date: Sat, 3 Dec 2016 17:32:24 +0100 +Subject: [PATCH] abuild: Make default_prepare() always end up in "$builddir". + +So far default_prepare() ended up in "$builddir" only if there were any +patches. It's better to be more consistent and make such change always. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index e49956b76d04..f56ac033f6a9 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -565,10 +565,10 @@ have_patches() { + + default_prepare() { + local i ++ cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + if ! have_patches; then + return 0 + fi +- cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + for i in $source; do + case $i in + *.patch) +-- +2.8.3 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 06f1edce31e5..d68fee48d656 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,6 +21,7 @@ options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-properly-detect-failure-of-dependency-install.patch + 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -64,8 +65,11 @@ gems() { } md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz -5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch" +5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch +d224cd465365187046768d4484102cb5 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz -e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch" +e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch +1a422ba699fcb4875495da61675a2de604d7cc4421c78a7479ab8ae2407316a2 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz -1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch" +1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch +6128c43a3447dd292ac2aaa6610d7f43e774275b4dd8389e3d6772cc793657c12c61da56ef3215d539690c8e6b9a0853a1016951ff24fb717b5540d1c79eaccf 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
--- Changes since v1: - Before I generated checksums for patch w/ To: and Cc: lines. I removed them from the patch, but forgot to regenerate checksums. Sorry for that. ...-default_prepare-always-end-up-in-builddi.patch | 30 ++++++++++++++++++++++ main/abuild/APKBUILD | 12 ++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch diff --git a/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch new file mode 100644 index 000000000000..38f8174594bb --- /dev/null +++ b/main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch @@ -0,0 +1,30 @@ +From d5fd6ff4c997a3b50f78deab7b0f2cd545f8c44f Mon Sep 17 00:00:00 2001 +From: Przemyslaw Pawelczyk <przemoc@zoho.com> +Date: Sat, 3 Dec 2016 17:32:24 +0100 +Subject: [PATCH] abuild: Make default_prepare() always end up in "$builddir". + +So far default_prepare() ended up in "$builddir" only if there were any +patches. It's better to be more consistent and make such change always. +--- + abuild.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/abuild.in b/abuild.in +index e49956b76d04..f56ac033f6a9 100644 +--- a/abuild.in ++++ b/abuild.in +@@ -565,10 +565,10 @@ have_patches() { + + default_prepare() { + local i ++ cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + if ! have_patches; then + return 0 + fi +- cd "$builddir" || { error "Is \$builddir set correctly?"; return 1; } + for i in $source; do + case $i in + *.patch)
Timo Teras <timo.teras@iki.fi>The problem with this is that not abuild's are updated yet to define $builddir. This would make those fail. If it tries to cd there by default, it should at least check that $builddir is defined. This was the logic for cd:ing $builddir: - since not all (yet) set $builddir, don't do it by default - the abuilds that use $_builddir and have patches, should ship their own prepare() so it's assumed that having patches and getting to default_prepare the variable name has been fixed too I'd be ok, if in "if ! have_patches" we check if $builddir is set and cd to it. Thanks, Timo --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
+-- +2.8.3 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 06f1edce31e5..a6f91e95c586 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,7 +2,7 @@ pkgname=abuild pkgver=2.29.0 _ver=${pkgver%_git*} -pkgrel=1 +pkgrel=2 pkgdesc="Script to build Alpine Packages" url="http://git.alpinelinux.org/cgit/abuild/" arch="all" @@ -21,6 +21,7 @@ options="suid" pkggroups="abuild" source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz 0001-abuild-properly-detect-failure-of-dependency-install.patch + 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch " _builddir="$srcdir/$pkgname-$_ver" @@ -64,8 +65,11 @@ gems() { } md5sums="1a51f8786331ddf79bf46357fe938f6a abuild-2.29.0.tar.xz -5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch" +5dc373cd5daf473a4ee060f9cedbc9c0 0001-abuild-properly-detect-failure-of-dependency-install.patch +5d581130ad0c0122025697773a356c77 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha256sums="06ba81d4b42e7d1ebb0761b0b0e1cbaf999acac54ab075906cecdf8f825950c1 abuild-2.29.0.tar.xz -e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch" +e79ba4cdcdea3fa18d8441b8144c2db8c497523ee56927b466a701736ee9b906 0001-abuild-properly-detect-failure-of-dependency-install.patch +997aa2a222201d5b06149f9f43519ddd0c46a1820d230b749214e6ce796fa97e 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" sha512sums="349c0d5efaff05dc6f680a93e59a997857991520ae892426252d198aa4ef0b2854f1675ce3b1bc1bea810d5f97fae0985474ea13df3905d590b320373723990c abuild-2.29.0.tar.xz -1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch" +1bc4bb62ee881051f41f5f68d25f8794208407f552a30bd7aad235c0bd57ebadc2a12dc21a4c1826eff3e320a5f9e7c40f89fd964144ff2f0d49f747708a61b4 0001-abuild-properly-detect-failure-of-dependency-install.patch +07fa01398135e27cef983a4846910e27a50cc06524e01016f425f1d35ff8962a1d6d4d0d3e1277bfba47dece56e526bc1f34bc2c512310b07a59bf323c64197f 0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch" -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---
Timo Teras <timo.teras@iki.fi>> ...-default_prepare-always-end-up-in-builddi.patch | 30 > ++++++++++++++++++++++ > main/abuild/APKBUILD | 12 ++++++--- 2 > files changed, 38 insertions(+), 4 deletions(-) create mode 100644 > main/abuild/0004-abuild-Make-default_prepare-always-end-up-in-builddi.patch We generally want abuild patches to first go to abuild.git.