mirror of
https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git
synced 2025-07-13 11:29:46 +03:00
b8f35d45b8
In order to get cross-compilers, we generate a few aports (e.g.
binutils-armhf, gcc-armhf) automatically from Alpine's aports.
pmbootstrap was already able to perform a git checkout of Alpine's
aports repository. But it needed to be manually updated. Otherwise
the `pmbootstrap aportgen` command could actually downgrade the aport
instead of updating it to the current version.
After thinking about adding a dedicated pmbootstrap command for
updating git repositories, I thought it would be better to not open
that can of worms (pmbootstrap as general git wrapper? no thanks).
The solution implemented here compares the upstream aport version of
the git checkout of a certain package (e.g. gcc for gcc-armhf) with the
version in Alpine's binary package APKINDEX. When the aport version is
lower than the binary package version, it shows the user how to update
the git repository with just one command:
pmbootstrap chroot --add=git --user -- \
git -C /mnt/pmbootstrap-git/aports_upstream pull
Changes:
* `pmb.aportgen.core.get_upstream_aport()`: new function, that returns
the absolute path to the upstream aport on disk, after checking the
version of the aport against the binary package.
* Use that new function in pmb.aportgen.gcc and pmb.aportgen.binutils
* New function `pmb.helpers.repo.alpine_apkindex_path()`: updates the
APKINDEX if necessary and returns the absolute path to the APKINDEX.
This code was basically present already, but not as function, so now
we have a bit less overhead there.
* `pmbootstrap chroot`: new `--user` argument
* `pmb.parse.apkbuild`: make pkgname check optional, as it fails with
the official gcc APKBUILD before we modify it (the current APKBUILD
parser is not meant to be perfect, as this would require a full shell
parsing implementation).
* Extended `test_aportgen.py` and enabled it by default in
`testcases_fast.sh`. Previously it was disabled due to traffic
concerns (cloning the aports repo, but then again we do a full KDE
plasma mobile installation in Travis now, so that shouldn't matter
too much).
* `testcases_fast.sh`: With "test_aport_in_sync_with_git" removed
from the disabled-by-default list (left over from timestamp based
rebuilds), there were no more test cases disabled by default. I've
changed it, so now the qemu_running_processes test case is disabled,
and added an `--all` parameter to the script to disable no test
cases. Travis runs with the `--all` parameter while it's useful to
do a quick local test without `--all` in roughly 2 minutes instead of
10.
* `aports/cross/binutils-*`: Fix `_mirror` variable to point to current
default Alpine mirror (so the aportgen testcase runs through).
108 lines
3.8 KiB
Python
108 lines
3.8 KiB
Python
"""
|
|
Copyright 2018 Oliver Smith
|
|
|
|
This file is part of pmbootstrap.
|
|
|
|
pmbootstrap is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
pmbootstrap is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with pmbootstrap. If not, see <http://www.gnu.org/licenses/>.
|
|
"""
|
|
import pmb.aportgen.core
|
|
import pmb.helpers.git
|
|
import pmb.helpers.run
|
|
|
|
|
|
def generate(args, pkgname):
|
|
# Copy original aport
|
|
arch = pkgname.split("-")[1]
|
|
upstream = pmb.aportgen.core.get_upstream_aport(args, "main/gcc")
|
|
pmb.helpers.run.user(args, ["cp", "-r", upstream, args.work + "/aportgen"])
|
|
|
|
# Architectures to build this package for
|
|
arches = list(pmb.config.build_device_architectures)
|
|
arches.remove(arch)
|
|
|
|
# Rewrite APKBUILD
|
|
fields = {
|
|
"pkgname": pkgname,
|
|
"pkgdesc": "Stage2 cross-compiler for " + arch,
|
|
"arch": " ".join(arches),
|
|
"depends": "isl binutils-" + arch,
|
|
"makedepends_build": "gcc g++ paxmark bison flex texinfo gawk zip gmp-dev mpfr-dev mpc1-dev zlib-dev",
|
|
"makedepends_host": "linux-headers gmp-dev mpfr-dev mpc1-dev isl-dev zlib-dev musl-dev-" + arch + " binutils-" + arch,
|
|
"subpackages": "g++-" + arch + ":gpp",
|
|
|
|
"LIBGOMP": "false",
|
|
"LIBGCC": "false",
|
|
"LIBATOMIC": "false",
|
|
"LIBITM": "false",
|
|
}
|
|
|
|
below_header = "CTARGET_ARCH=" + arch + """
|
|
CTARGET="$(arch_to_hostspec ${CTARGET_ARCH})"
|
|
CBUILDROOT="/usr/$CTARGET"
|
|
LANG_OBJC=false
|
|
LANG_JAVA=false
|
|
LANG_GO=false
|
|
LANG_FORTRAN=false
|
|
LANG_ADA=false
|
|
options="!strip !tracedeps"
|
|
|
|
# Wrap the package function, to make the resulting package
|
|
# lazy-reproducible
|
|
package() {
|
|
# Repack the *.a files to be reproducible (see #64)
|
|
_temp="$_builddir"/_reproducible-patch
|
|
cd "$_builddir"
|
|
for f in $(find -name '*.a'); do
|
|
# Copy to a temporary folder
|
|
echo "Repack $f to be reproducible"
|
|
mkdir -p "$_temp"
|
|
cd "$_temp"
|
|
cp "$_builddir"/"$f" .
|
|
|
|
# Repack with a sorted file order
|
|
ar x *.a
|
|
rm *.a
|
|
ar r sorted.a $(find -name '*.o' | sort)
|
|
|
|
# Copy back and clean up
|
|
cp -v sorted.a "$_builddir"/"$f"
|
|
cd ..
|
|
rm -r "$_temp"
|
|
done
|
|
|
|
# Unmodified package function from the gcc APKBUILD
|
|
_package
|
|
|
|
# Workaround for: postmarketOS/binary-package-repo#1
|
|
echo "Replacing hardlinks with symlinks"
|
|
rm -v "$pkgdir"/usr/bin/"$CTARGET"-c++
|
|
ln -s -v /usr/bin/"$CTARGET"-g++ "$pkgdir"/usr/bin/"$CTARGET"-c++
|
|
rm -v "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
|
|
ln -s -v /usr/bin/"$CTARGET"-gcc "$pkgdir"/usr/bin/"$CTARGET"-gcc-"$pkgver"
|
|
}
|
|
"""
|
|
|
|
replace_simple = {
|
|
# Do not package libstdc++, do not add "g++-$ARCH" here (already
|
|
# did that explicitly in the subpackages variable above, so
|
|
# pmbootstrap picks it up properly).
|
|
'*subpackages="$subpackages libstdc++:libcxx:*': None,
|
|
|
|
# Rename package to _package, so we can wrap it (see above)
|
|
'*package() {*': "_package() {"
|
|
}
|
|
|
|
pmb.aportgen.core.rewrite(args, pkgname, "main/gcc", fields,
|
|
replace_simple=replace_simple,
|
|
below_header=below_header)
|