a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
Fix compilation when using system libminiupnpc with libutp disabled
|
|
|
|
If transmission uses its own copy of libminiupnpc in third-party/ then
|
|
the configure script adds that path to CFLAGS:
|
|
https://trac.transmissionbt.com/browser/trunk/configure.ac#L455
|
|
|
|
This path is also added if transmission uses its own copy of libutp:
|
|
https://trac.transmissionbt.com/browser/trunk/configure.ac#L349
|
|
|
|
But if a system-provided libminiupnpc is used and utp-support is
|
|
disabled using --disable-utp the result is a build error, detected by
|
|
buildroot autobuilders:
|
|
http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log
|
|
|
|
net.c:40:24: fatal error: libutp/utp.h: No such file or directory
|
|
|
|
Patch proposed by Yann E. MORIN:
|
|
http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html
|
|
|
|
Patch sent upstream: https://trac.transmissionbt.com/ticket/6163
|
|
|
|
Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
|
|
|
|
diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac
|
|
--- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100
|
|
+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200
|
|
@@ -358,6 +358,10 @@
|
|
else
|
|
AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found")
|
|
fi
|
|
+else
|
|
+ # For the system libminiupnpc with UTC disabled,
|
|
+ # point to our bundled UTP headers
|
|
+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
|
|
fi
|
|
AC_SUBST(LIBUTP_CFLAGS)
|
|
AC_SUBST(LIBUTP_LIBS)
|
|
@@ -457,7 +461,7 @@
|
|
LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
|
|
else
|
|
AC_DEFINE([SYSTEM_MINIUPNP])
|
|
- LIBUPNP_CFLAGS=""
|
|
+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}"
|
|
LIBUPNP_LIBS="-lminiupnpc"
|
|
LIBUPNP_LIBS_QT="-lminiupnpc"
|
|
fi
|