Import buildroot 2016.02
This commit is contained in:
@@ -1,3 +1,45 @@
|
||||
2016.02, Released March 1st, 2016
|
||||
|
||||
Minor fixes, mostly security related.
|
||||
|
||||
Circular dependency issue with same-as-kernel linux-headers
|
||||
option fixed.
|
||||
|
||||
Updated/fixed packages: bluez5_utils, heirloom-mailx,
|
||||
imx-gpu-viv, kodi-pvr-argustv, kodi-pvr-mediaportal-tvserver,
|
||||
kodi-pvr-nextpvr, libfcgi, openssl, pifmrds, powerpc-utils,
|
||||
python-m2crypto, slang, sox, squid, tn5250, xerces, zsh
|
||||
|
||||
2016.02-rc3, Released February 27th, 2016
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Defconfigs: Ensure EABIhf is correctly enabled for ARM cores
|
||||
where VFP is optional (but present on the specific hw). Fix
|
||||
ARM variant selection for freescale_imx31_3stack_defconfig.
|
||||
|
||||
Ensure tarballs of downloaded git trees do not contain a
|
||||
timestamp.
|
||||
|
||||
Clarify license of patches in COPYING.
|
||||
|
||||
Updated/fixed package: avahi, binutils, cairo, can-festival,
|
||||
chrony, cifs-utils, dnsmasq, dvdauthor, e2fsprogs, efl,
|
||||
erlang-rebar, eudev, fbterm, gawk, gnupg2, gnuradio, gpm,
|
||||
gst1-plugins-good, hostapd, imagemagick, iproute2, iputils,
|
||||
jack2, kexec, kismet, lftp, libarchive, libeXosip2, libfm,
|
||||
libglib2, libsoil, libssh, libssh2, libuci, links, lshw, lxc,
|
||||
mediastreamer, mono, mraa, mutt, nfs-utils, numactl, ofono,
|
||||
omniorb, openipmi, openobex, patch, pax-utils, perf,
|
||||
pulseaudio, pure-ftp, qhull, qt, quagga, quota, sdl_sound,
|
||||
shairport-sync, spice, sysklogd, syslog-ng, trace-cmd,
|
||||
trousers, tvheadend, util-linux, vim, webkitgtk24, wireshark,
|
||||
wpa_supplicant, xerces, zsh
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#8651: libMonoPosixHelper.so wrong link reference in buildroot..
|
||||
|
||||
2016.02-rc2, Released February 18th, 2016
|
||||
|
||||
Fixes all over the tree.
|
||||
@@ -37,6 +79,11 @@
|
||||
A number of defconfigs have been extended to generate complete
|
||||
system images using genimage.
|
||||
|
||||
Linux: Automatically patch timeconst.pl for <3.9 kernels,
|
||||
which isn't compatible with modern perl versions, breaking the
|
||||
build when building on recent (Fedora 23, Debian
|
||||
Testing/Unstable, ..) distributions.
|
||||
|
||||
Makedevs utility now accepts textual (non-numerical) user and
|
||||
group names.
|
||||
|
||||
|
||||
@@ -1,3 +1,19 @@
|
||||
With the exceptions below, Buildroot is distributed under the terms of
|
||||
the GNU General Public License, reproduced below; either version 2 of
|
||||
the License, or (at your option) any later version.
|
||||
|
||||
Some files in Buildroot contain a different license statement. Those
|
||||
files are licensed under the license contained in the file itself.
|
||||
|
||||
Buildroot also bundles patch files, which are applied to the sources
|
||||
of the various packages. Those patches are not covered by the license
|
||||
of Buildroot. Instead, they are covered by the license of the software
|
||||
to which the patches are applied. When said software is available
|
||||
under multiple licenses, the Buildroot patches are only provided under
|
||||
the publicly accessible licenses.
|
||||
|
||||
-----------------------------------------------------------------
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ else # umask
|
||||
all:
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2016.02-rc2
|
||||
export BR2_VERSION := 2016.02
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
@@ -94,7 +94,7 @@ noconfig_targets := menuconfig nconfig gconfig xconfig config oldconfig randconf
|
||||
# something else than one of the nobuild_targets.
|
||||
nobuild_targets := source source-check \
|
||||
legal-info external-deps _external-deps \
|
||||
clean distclean
|
||||
clean distclean help
|
||||
ifeq ($(MAKECMDGOALS),)
|
||||
BR_BUILDING = y
|
||||
else ifneq ($(filter-out $(nobuild_targets),$(MAKECMDGOALS)),)
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
From 3d1a9b44b9dcd2c0f5d54c09596c96c0524d8340 Mon Sep 17 00:00:00 2001
|
||||
From: Gregory Hermant <gregory.hermant@calao-systems.com>
|
||||
Date: Tue, 13 Nov 2012 11:47:41 +0100
|
||||
Subject: [PATCH] trace-debug[stm]: Fix for BT/WLAN instability
|
||||
|
||||
Pins under mop500_ske_pins array are used for different
|
||||
functionalities in snowball. Ex: GPIO161 pin configured
|
||||
for keypad here must stay configured as GPIO alternate
|
||||
function for operating PMU_EN pin of BT/WLAN chip in snowball.
|
||||
So forbid configuring these pins, for snowball
|
||||
|
||||
Signed-off-by: Rajanikanth H.V <rajanikanth.hv@stericsson.com>
|
||||
Signed-off-by: Gregory Hermant <gregory.hermant@calao-systems.com>
|
||||
---
|
||||
arch/arm/mach-ux500/board-mop500-stm.c | 7 +++++--
|
||||
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-ux500/board-mop500-stm.c b/arch/arm/mach-ux500/board-mop500-stm.c
|
||||
index 1bef2a0..532fb9e 100644
|
||||
--- a/arch/arm/mach-ux500/board-mop500-stm.c
|
||||
+++ b/arch/arm/mach-ux500/board-mop500-stm.c
|
||||
@@ -121,7 +121,9 @@ static int stm_ste_disable_ape_on_mipi60(void)
|
||||
if (retval)
|
||||
STM_ERR("Failed to disable MIPI60\n");
|
||||
else {
|
||||
- retval = nmk_config_pins(ARRAY_AND_SIZE(mop500_ske_pins));
|
||||
+ if (!machine_is_snowball())
|
||||
+ retval = nmk_config_pins(
|
||||
+ ARRAY_AND_SIZE(mop500_ske_pins));
|
||||
if (retval)
|
||||
STM_ERR("Failed to enable SKE gpio\n");
|
||||
}
|
||||
@@ -314,7 +316,8 @@ static int stm_ste_connection(enum stm_connection_type con_type)
|
||||
/* Enable altC3 on GPIO70-74 (STMMOD) and GPIO75-76 (UARTMOD) */
|
||||
prcmu_enable_stm_mod_uart();
|
||||
/* Enable APE on MIPI60 */
|
||||
- retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
|
||||
+ if (!machine_is_snowball())
|
||||
+ retval = nmk_config_pins_sleep(ARRAY_AND_SIZE(mop500_ske_pins));
|
||||
if (retval)
|
||||
STM_ERR("Failed to disable SKE GPIO\n");
|
||||
else {
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_FPU_NEON=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_FPU_NEON=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a5=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_FPU_VFPV4D16=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Architecture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a5=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a5=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_FPU_VFPV4D16=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a5=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_FPU_VFPV4D16=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a5=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_FPU_VFPV4D16=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_INSTRUCTIONS_THUMB2=y
|
||||
# Linux headers same as kernel, a 3.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# architecture
|
||||
BR2_arm=y
|
||||
BR2_arm1136jf_s_r0=y
|
||||
BR2_arm1136jf_s=y
|
||||
BR2_ARM_EABIHF=y
|
||||
|
||||
# Linux headers same as kernel, a 3.15 series
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# architecture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
|
||||
# system
|
||||
BR2_TARGET_GENERIC_GETTY=y
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Architceture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
|
||||
# Linux headers same as kernel, a 3.0 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_0=y
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
# Architecture
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_FPU_VFPV3=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
|
||||
# Linux headers same as kernel, a 3.10 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_10=y
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_EABIHF=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
# Linux headers same as kernel, a 3.14 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
|
||||
|
||||
@@ -182,10 +182,87 @@ _Please, do not attach patches to bugs, send them to the mailing list
|
||||
instead_.
|
||||
|
||||
If you made some changes to Buildroot and you would like to contribute
|
||||
them to the Buildroot project, proceed as follows. Starting from the
|
||||
changes committed in your local git view, _rebase_ your development
|
||||
branch on top of the upstream tree before generating a patch set. To do
|
||||
so, run:
|
||||
them to the Buildroot project, proceed as follows.
|
||||
|
||||
==== The formatting of a patch
|
||||
|
||||
We expect patches to be formatted in a specific way. This is necessary
|
||||
to make it easy to review patches, to be able to apply them easily to
|
||||
the git repository, to make it easy to find back in the history how
|
||||
and why things have changed, and to make it possible to use +git
|
||||
bisect+ to locate the origin of a problem.
|
||||
|
||||
First of all, it is essential that the patch has a good commit
|
||||
message. The commit message should start with a separate line with a
|
||||
brief summary of the change, starting with the name of the affected
|
||||
package. The body of the commit message should describe _why_ this
|
||||
change is needed, and if necessary also give details about _how_ it
|
||||
was done. When writing the commit message, think of how the reviewers
|
||||
will read it, but also think about how you will read it when you look
|
||||
at this change again a few years down the line.
|
||||
|
||||
Second, the patch itself should do only one change, but do it
|
||||
completely. Two unrelated or weakly related changes should usually be
|
||||
done in two separate patches. This usually means that a patch affects
|
||||
only a single package. If several changes are related, it is often
|
||||
still possible to split them up in small patches and apply them in a
|
||||
specific order. Small patches make it easier to review, and often
|
||||
make it easier to understand afterwards why a change was done.
|
||||
However, each patch must be complete. It is not allowed that the
|
||||
build is broken when only the first but not the second patch is
|
||||
applied. This is necessary to be able to use +git bisect+ afterwards.
|
||||
|
||||
Of course, while you're doing your development, you're probably going
|
||||
back and forth between packages, and certainly not committing things
|
||||
immediately in a way that is clean enough for submission. So most
|
||||
developers rewrite the history of commits to produce a clean set of
|
||||
commits that is appropriate for submission. To do this, you need to
|
||||
use _interactive rebasing_. You can learn about it
|
||||
https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History[in the Pro
|
||||
Git book]. Sometimes, it is even easier to discard you history with
|
||||
+git reset --soft origin/master+ and select individual changes with
|
||||
+git add -i+ or +git add -p+.
|
||||
|
||||
Finally, the patch should be signed off. This is done by adding
|
||||
+Signed-off-by: Your Real Name <your@email.address>+ at the end of the
|
||||
commit message. +git commit -s+ does that for you, if configured
|
||||
properly. The +Signed-off-by+ tag means that you publish the patch
|
||||
under the Buildroot license (i.e. GPLv2, except for package patches,
|
||||
which have the upstream license), and that you are allowed to do so.
|
||||
See http://developercertificate.org/[the Developer Certificate of
|
||||
Origin] for details.
|
||||
|
||||
When adding new packages, you should submit every package in a
|
||||
separate patch. This patch should have the update to
|
||||
+package/Config.in+, the package +Config.in+ file, the +.mk+ file, the
|
||||
+.hash+ file, any init script, and all package patches. If the package
|
||||
has many sub-options, these are sometimes better added as separate
|
||||
follow-up patches. The summary line should be something like
|
||||
+<packagename>: new package+. The body of the commit message can be
|
||||
empty for simple packages, or it can contain the description of the
|
||||
package (like the Config.in help text). If anything special has to be
|
||||
done to build the package, this should also be explained explicitly in
|
||||
the commit message body.
|
||||
|
||||
When you bump a package to a new version, you should also submit a
|
||||
separate patch for each package. Don't forget to update the +.hash+
|
||||
file, or add it if it doesn't exist yet. Also don't forget to check if
|
||||
the +_LICENSE+ and +_LICENSE_FILES+ are still valid. The summary line
|
||||
should be something like +<packagename>: bump to version <new
|
||||
version>+. If the new version only contains security updates compared
|
||||
to the existing one, the summary should be +<packagename>: security
|
||||
bump to version <new version>+ and the commit message body should show
|
||||
the CVE numbers that are fixed. If some package patches can be removed
|
||||
in the new version, it should be explained explicitly why they can be
|
||||
removed, preferably with the upstream commit ID. Also any other
|
||||
required changes should be explained explicitly, like configure
|
||||
options that no longer exist or are no longer needed.
|
||||
|
||||
==== Preparing a patch series
|
||||
|
||||
Starting from the changes committed in your local git view, _rebase_
|
||||
your development branch on top of the upstream tree before generating
|
||||
a patch set. To do so, run:
|
||||
|
||||
---------------------
|
||||
$ git fetch --all --tags
|
||||
|
||||
@@ -74,6 +74,9 @@ file to inform you of relevant material that could not be saved.
|
||||
Here is a list of the licenses that are most widely used by packages in
|
||||
Buildroot, with the name used in the manifest files:
|
||||
|
||||
* `AGPLv3`:
|
||||
http://www.gnu.org/licenses/agpl-3.0.en.html[
|
||||
GNU Affero General Public License, version 3];
|
||||
* `GPLv2`:
|
||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
|
||||
GNU General Public License, version 2];
|
||||
@@ -131,11 +134,13 @@ Buildroot, with the name used in the manifest files:
|
||||
http://apache.org/licenses/LICENSE-2.0.html[
|
||||
Apache License, version 2.0];
|
||||
|
||||
[[legal-info-buildroot]]
|
||||
=== Complying with the Buildroot license
|
||||
|
||||
Buildroot itself is an open source software, released under the
|
||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General Public
|
||||
License, version 2] or (at your option) any later version.
|
||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[GNU General
|
||||
Public License, version 2] or (at your option) any later version, with
|
||||
the exception of the package patches detailed below.
|
||||
However, being a build system, it is not normally part of the end product:
|
||||
if you develop the root filesystem, kernel, bootloader or toolchain for a
|
||||
device, the code of Buildroot is only present on the development machine, not
|
||||
@@ -156,3 +161,14 @@ material that must be redistributed.
|
||||
|
||||
Keep in mind that this is only the Buildroot developers' opinion, and you
|
||||
should consult your legal department or lawyer in case of any doubt.
|
||||
|
||||
==== Patches to packages
|
||||
|
||||
Buildroot also bundles patch files, which are applied to the sources
|
||||
of the various packages. Those patches are not covered by the license
|
||||
of Buildroot. Instead, they are covered by the license of the software
|
||||
to which the patches are applied. When said software is available
|
||||
under multiple licenses, the Buildroot patches are only provided under
|
||||
the publicly accessible licenses.
|
||||
|
||||
See xref:patch-policy[] for the technical details.
|
||||
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@@ -155,8 +155,8 @@ List of Examples
|
||||
|
||||
---------------------------------------------------------------------
|
||||
|
||||
Buildroot 2016.02-rc2 manual generated on 2016-02-18 14:38:24 UTC
|
||||
from git revision 6cd8cbc
|
||||
Buildroot 2016.02 manual generated on 2016-03-01 20:53:10 UTC from
|
||||
git revision aaf6c28
|
||||
|
||||
The Buildroot manual is written by the Buildroot developers. It is
|
||||
licensed under the GNU General Public License, version 2. Refer to
|
||||
@@ -2746,6 +2746,8 @@ inform you of relevant material that could not be saved.
|
||||
Here is a list of the licenses that are most widely used by packages
|
||||
in Buildroot, with the name used in the manifest files:
|
||||
|
||||
* AGPLv3: GNU Affero General Public License, version 3 [http://
|
||||
www.gnu.org/licenses/agpl-3.0.en.html];
|
||||
* GPLv2: GNU General Public License, version 2 [http://www.gnu.org/
|
||||
licenses/old-licenses/gpl-2.0.html];
|
||||
* GPLv2+: GNU General Public License, version 2 [http://www.gnu.org
|
||||
@@ -2789,11 +2791,12 @@ in Buildroot, with the name used in the manifest files:
|
||||
|
||||
Buildroot itself is an open source software, released under the GNU
|
||||
General Public License, version 2 [http://www.gnu.org/licenses/
|
||||
old-licenses/gpl-2.0.html] or (at your option) any later version.
|
||||
However, being a build system, it is not normally part of the end
|
||||
product: if you develop the root filesystem, kernel, bootloader or
|
||||
toolchain for a device, the code of Buildroot is only present on the
|
||||
development machine, not in the device storage.
|
||||
old-licenses/gpl-2.0.html] or (at your option) any later version,
|
||||
with the exception of the package patches detailed below. However,
|
||||
being a build system, it is not normally part of the end product: if
|
||||
you develop the root filesystem, kernel, bootloader or toolchain for
|
||||
a device, the code of Buildroot is only present on the development
|
||||
machine, not in the device storage.
|
||||
|
||||
Nevertheless, the general view of the Buildroot developers is that
|
||||
you should release the Buildroot source code along with the source
|
||||
@@ -2811,6 +2814,17 @@ Keep in mind that this is only the Buildroot developers' opinion, and
|
||||
you should consult your legal department or lawyer in case of any
|
||||
doubt.
|
||||
|
||||
12.3.1. Patches to packages
|
||||
|
||||
Buildroot also bundles patch files, which are applied to the sources
|
||||
of the various packages. Those patches are not covered by the license
|
||||
of Buildroot. Instead, they are covered by the license of the
|
||||
software to which the patches are applied. When said software is
|
||||
available under multiple licenses, the Buildroot patches are only
|
||||
provided under the publicly accessible licenses.
|
||||
|
||||
See Chapter 18, Patching a package for the technical details.
|
||||
|
||||
Chapter 13. Beyond Buildroot
|
||||
|
||||
13.1. Boot the generated images
|
||||
@@ -5688,8 +5702,8 @@ If something goes wrong in the steps 3 or 4, then the build fails.
|
||||
|
||||
18.3. Format and licensing of the package patches
|
||||
|
||||
Patches are released under the same license as the software that is
|
||||
modified.
|
||||
Patches are released under the same license as the software they
|
||||
apply to (see Section 12.3, “Complying with the Buildroot license”).
|
||||
|
||||
A message explaining what the patch does, and why it is needed,
|
||||
should be added in the header commentary of the patch.
|
||||
@@ -5977,6 +5991,83 @@ instead.
|
||||
|
||||
If you made some changes to Buildroot and you would like to
|
||||
contribute them to the Buildroot project, proceed as follows.
|
||||
|
||||
21.5.1. The formatting of a patch
|
||||
|
||||
We expect patches to be formatted in a specific way. This is
|
||||
necessary to make it easy to review patches, to be able to apply them
|
||||
easily to the git repository, to make it easy to find back in the
|
||||
history how and why things have changed, and to make it possible to
|
||||
use git bisect to locate the origin of a problem.
|
||||
|
||||
First of all, it is essential that the patch has a good commit
|
||||
message. The commit message should start with a separate line with a
|
||||
brief summary of the change, starting with the name of the affected
|
||||
package. The body of the commit message should describe why this
|
||||
change is needed, and if necessary also give details about how it was
|
||||
done. When writing the commit message, think of how the reviewers
|
||||
will read it, but also think about how you will read it when you look
|
||||
at this change again a few years down the line.
|
||||
|
||||
Second, the patch itself should do only one change, but do it
|
||||
completely. Two unrelated or weakly related changes should usually be
|
||||
done in two separate patches. This usually means that a patch affects
|
||||
only a single package. If several changes are related, it is often
|
||||
still possible to split them up in small patches and apply them in a
|
||||
specific order. Small patches make it easier to review, and often
|
||||
make it easier to understand afterwards why a change was done.
|
||||
However, each patch must be complete. It is not allowed that the
|
||||
build is broken when only the first but not the second patch is
|
||||
applied. This is necessary to be able to use git bisect afterwards.
|
||||
|
||||
Of course, while you’re doing your development, you’re probably going
|
||||
back and forth between packages, and certainly not committing things
|
||||
immediately in a way that is clean enough for submission. So most
|
||||
developers rewrite the history of commits to produce a clean set of
|
||||
commits that is appropriate for submission. To do this, you need to
|
||||
use interactive rebasing. You can learn about it in the Pro Git book
|
||||
[https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History].
|
||||
Sometimes, it is even easier to discard you history with git reset
|
||||
--soft origin/master and select individual changes with git add -i or
|
||||
git add -p.
|
||||
|
||||
Finally, the patch should be signed off. This is done by adding
|
||||
Signed-off-by: Your Real Name <> at the end of the commit message.
|
||||
git commit -s does that for you, if configured properly. The
|
||||
Signed-off-by tag means that you publish the patch under the
|
||||
Buildroot license (i.e. GPLv2, except for package patches, which have
|
||||
the upstream license), and that you are allowed to do so. See the
|
||||
Developer Certificate of Origin [http://developercertificate.org/]
|
||||
for details.
|
||||
|
||||
When adding new packages, you should submit every package in a
|
||||
separate patch. This patch should have the update to package/
|
||||
Config.in, the package Config.in file, the .mk file, the .hash file,
|
||||
any init script, and all package patches. If the package has many
|
||||
sub-options, these are sometimes better added as separate follow-up
|
||||
patches. The summary line should be something like <packagename>: new
|
||||
package. The body of the commit message can be empty for simple
|
||||
packages, or it can contain the description of the package (like the
|
||||
Config.in help text). If anything special has to be done to build the
|
||||
package, this should also be explained explicitly in the commit
|
||||
message body.
|
||||
|
||||
When you bump a package to a new version, you should also submit a
|
||||
separate patch for each package. Don’t forget to update the .hash
|
||||
file, or add it if it doesn’t exist yet. Also don’t forget to check
|
||||
if the _LICENSE and _LICENSE_FILES are still valid. The summary line
|
||||
should be something like <packagename>: bump to version <new
|
||||
version>. If the new version only contains security updates compared
|
||||
to the existing one, the summary should be <packagename>: security
|
||||
bump to version <new version> and the commit message body should show
|
||||
the CVE numbers that are fixed. If some package patches can be
|
||||
removed in the new version, it should be explained explicitly why
|
||||
they can be removed, preferably with the upstream commit ID. Also any
|
||||
other required changes should be explained explicitly, like configure
|
||||
options that no longer exist or are no longer needed.
|
||||
|
||||
21.5.2. Preparing a patch series
|
||||
|
||||
Starting from the changes committed in your local git view, rebase
|
||||
your development branch on top of the upstream tree before generating
|
||||
a patch set. To do so, run:
|
||||
@@ -6008,7 +6099,7 @@ line-wrapped, otherwise they cannot easily be applied. In such a
|
||||
case, fix your e-mail client, or better yet, learn to use git
|
||||
send-email.
|
||||
|
||||
21.5.1. Cover letter
|
||||
21.5.3. Cover letter
|
||||
|
||||
If you want to present the whole patch set in a separate mail, add
|
||||
--cover-letter to the git format-patch command (see man
|
||||
@@ -6024,7 +6115,7 @@ the following cases:
|
||||
* whenever you feel it will help presenting your work, your
|
||||
choices, the review process, etc.
|
||||
|
||||
21.5.2. Patch revision changelog
|
||||
21.5.4. Patch revision changelog
|
||||
|
||||
When improvements are requested, the new revision of each commit
|
||||
should include a changelog of the modifications between each
|
||||
|
||||
@@ -90,8 +90,8 @@ If something goes wrong in the steps _3_ or _4_, then the build fails.
|
||||
|
||||
=== Format and licensing of the package patches
|
||||
|
||||
Patches are released under the same license as the software that is
|
||||
modified.
|
||||
Patches are released under the same license as the software they apply
|
||||
to (see xref:legal-info-buildroot[]).
|
||||
|
||||
A message explaining what the patch does, and why it is needed, should
|
||||
be added in the header commentary of the patch.
|
||||
|
||||
@@ -8,74 +8,74 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2015.11.1</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2016.02</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2015.11.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2015.11.1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2015.11.1.tar.gz">buildroot-2015.11.1.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2015.11.1.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.02.tar.gz">buildroot-2016.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2015.11.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2015.11.1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2015.11.1.tar.bz2">buildroot-2015.11.1.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2015.11.1.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.02.tar.bz2">buildroot-2016.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2016.02-rc2</b></h3>
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2016.02-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2016.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.02-rc2.tar.gz">buildroot-2016.02-rc2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02-rc2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.02-rc3.tar.gz">buildroot-2016.02-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02-rc3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2016.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2016.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2016.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2016.02-rc2.tar.bz2">buildroot-2016.02-rc2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02-rc2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2016.02-rc3.tar.bz2">buildroot-2016.02-rc3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2016.02-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,46 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2016.02 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 March 2016</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2016.02 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2016.02">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2016.02.tar.bz2">2016.02 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2016.02-rc3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>27 February 2016</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>Release candidate 3 is out with more cleanups and security
|
||||
/ build fixes. See
|
||||
the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2016.02-rc3">CHANGES</a>
|
||||
file for details.</p>
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to
|
||||
pick up
|
||||
the <a href="/downloads/buildroot-2016.02-rc3.tar.bz2">2016.02-rc3
|
||||
release candidate</a>, and report any problems found to
|
||||
the <a href="support.html">mailing list</a>
|
||||
or <a href="https://bugs.uclibc.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
|
||||
@@ -27,7 +27,7 @@ choice
|
||||
prompt "Kernel version"
|
||||
|
||||
config BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
bool "4.4.2"
|
||||
bool "4.4.3"
|
||||
|
||||
config BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@@ -104,7 +104,7 @@ config BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.4.2" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.4.3" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL
|
||||
|
||||
@@ -27,6 +27,19 @@ PERF_MAKE_FLAGS = \
|
||||
WERROR=0 \
|
||||
ASCIIDOC=
|
||||
|
||||
# We need to pass an argument to ld for setting the endianness when
|
||||
# building it for MIPS architecture, otherwise the default one will
|
||||
# always be used (which is big endian) and the compilation for little
|
||||
# endian will always fail showing an error like this one:
|
||||
# LD foo.o
|
||||
# mips-linux-gnu-ld: foo.o: compiled for a little endian system and
|
||||
# target is big endian
|
||||
ifeq ($(BR2_mips)$(BR2_mips64),y)
|
||||
PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EB"
|
||||
else ifeq ($(BR2_mipsel)$(BR2_mips64el),y)
|
||||
PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EL"
|
||||
endif
|
||||
|
||||
# The call to backtrace() function fails for ARC, because for some
|
||||
# reason the unwinder from libgcc returns early. Thus the usage of
|
||||
# backtrace() should be disabled in perf explicitly: at build time
|
||||
|
||||
@@ -115,6 +115,10 @@ else
|
||||
AVAHI_CONF_OPTS += --disable-libdaemon
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
AVAHI_DEPENDENCIES += libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y)
|
||||
AVAHI_DEPENDENCIES += expat
|
||||
AVAHI_CONF_OPTS += --with-xml=expat
|
||||
|
||||
@@ -61,6 +61,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
BINUTILS_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
BINUTILS_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
# "host" binutils should actually be "cross"
|
||||
# We just keep the convention of "host utility" for now
|
||||
HOST_BINUTILS_CONF_OPTS = \
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 01d85fdf6a45150e82143803be3373d779d18522 Mon Sep 17 00:00:00 2001
|
||||
From: John Keeping <john@metanate.com>
|
||||
Date: Wed, 24 Feb 2016 13:57:38 +0000
|
||||
Subject: [PATCH] tools/avinfo: Fix big endian build
|
||||
|
||||
Commit 101b439 (tools/avinfo: Add partial support for Sony LDAC) added a
|
||||
new a2dp_ldac_t structure but only inside a little endian ifdef. Add
|
||||
the same structure in the big endian code.
|
||||
|
||||
The structure definition doesn't differ for the big/little endian cases
|
||||
but if the unknown fields are discovered in the future it might, so a
|
||||
copy is added rather than pulling the existing definition below the
|
||||
endif.
|
||||
|
||||
[John: backport from upstream commit 01d85fdf6a45150e82143803be3373d779d18522.]
|
||||
Signed-off-by: John Keeping <john@metanate.com>
|
||||
---
|
||||
profiles/audio/a2dp-codecs.h | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/profiles/audio/a2dp-codecs.h b/profiles/audio/a2dp-codecs.h
|
||||
index e9da0bf..4fb5c0c 100644
|
||||
--- a/profiles/audio/a2dp-codecs.h
|
||||
+++ b/profiles/audio/a2dp-codecs.h
|
||||
@@ -234,6 +234,11 @@ typedef struct {
|
||||
uint8_t channel_mode:4;
|
||||
} __attribute__ ((packed)) a2dp_aptx_t;
|
||||
|
||||
+typedef struct {
|
||||
+ a2dp_vendor_codec_t info;
|
||||
+ uint8_t unknown[2];
|
||||
+} __attribute__ ((packed)) a2dp_ldac_t;
|
||||
+
|
||||
#else
|
||||
#error "Unknown byte order"
|
||||
#endif
|
||||
--
|
||||
2.7.0.226.gfe986fe
|
||||
|
||||
@@ -93,6 +93,10 @@ else
|
||||
CAIRO_CONF_OPTS += --disable-vg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LZO),y)
|
||||
CAIRO_DEPENDENCIES += lzo
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x
|
||||
CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
|
||||
|
||||
@@ -2,13 +2,16 @@ config BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
bool
|
||||
default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm
|
||||
|
||||
comment "canfestival needs a toolchain w/ threads and dynamic library"
|
||||
comment "canfestival needs a (e)glibc or uClibc toolchain w/ threads and dynamic library"
|
||||
depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_USES_MUSL || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_CANFESTIVAL
|
||||
bool "canfestival"
|
||||
depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
help
|
||||
|
||||
@@ -16,6 +16,12 @@ CHRONY_CONF_OPTS = \
|
||||
--without-seccomp \
|
||||
--without-tomcrypt
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
CHRONY_DEPENDENCIES += libcap
|
||||
else
|
||||
CHRONY_CONF_OPTS += --without-libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNSS),y)
|
||||
CHRONY_DEPENDENCIES += host-pkgconf libnss
|
||||
else
|
||||
|
||||
@@ -14,6 +14,10 @@ ifeq ($(BR2_STATIC_LIBS),y)
|
||||
CIFS_UTILS_CONF_OPTS += --disable-pie
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_KEYUTILS),y)
|
||||
CIFS_UTILS_DEPENDENCIES += keyutils
|
||||
endif
|
||||
|
||||
define CIFS_UTILS_NO_WERROR
|
||||
$(SED) 's/-Werror//' $(@D)/Makefile.in
|
||||
endef
|
||||
|
||||
@@ -55,6 +55,7 @@ config BR2_PACKAGE_CONNMAN_NEARD
|
||||
config BR2_PACKAGE_CONNMAN_OFONO
|
||||
bool "enable ofono support"
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # libcap-ng
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ofono
|
||||
select BR2_PACKAGE_OFONO
|
||||
|
||||
config BR2_PACKAGE_CONNMAN_DEBUG
|
||||
|
||||
@@ -11,7 +11,7 @@ DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)"
|
||||
DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
|
||||
DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)"
|
||||
DNSMASQ_DEPENDENCIES = host-pkgconf
|
||||
DNSMASQ_LICENSE = Dual GPLv2/GPLv3
|
||||
DNSMASQ_LICENSE = GPLv2 or GPLv3
|
||||
DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
|
||||
|
||||
ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
|
||||
|
||||
@@ -34,6 +34,10 @@ ifeq ($(BR2_PACKAGE_FONTCONFIG),y)
|
||||
DVDAUTHOR_DEPENDENCIES += fontconfig
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
|
||||
DVDAUTHOR_DEPENDENCIES += libfribidi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y)
|
||||
DVDAUTHOR_DEPENDENCIES += libdvdread
|
||||
DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
config BR2_PACKAGE_E2FSPROGS
|
||||
bool "e2fsprogs"
|
||||
depends on BR2_USE_WCHAR # util-linux
|
||||
|
||||
@@ -2,7 +2,8 @@ config BR2_PACKAGE_EFL
|
||||
bool "efl"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_HAS_UDEV # libudev
|
||||
depends on BR2_PACKAGE_LUA # lua 5.1 or better
|
||||
# https://phab.enlightenment.org/T2728
|
||||
depends on BR2_PACKAGE_LUA_5_1 # needs lua 5.1, broken with 5.2+
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_USE_WCHAR # use wchar_t
|
||||
@@ -185,6 +186,6 @@ comment "efl needs udev /dev management and a toolchain w/ C++, dynamic library,
|
||||
|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
comment "efl needs lua"
|
||||
depends on !BR2_PACKAGE_LUA
|
||||
comment "efl needs lua 5.1"
|
||||
depends on !BR2_PACKAGE_LUA_5_1
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -13,8 +13,8 @@ ERLANG_REBAR_SITE = $(call github,rebar,rebar,$(ERLANG_REBAR_VERSION))
|
||||
|
||||
# Although the file LICENSE state Apache-2.0, a lot (if not all) the files
|
||||
# in src/ bear the MIT licence.
|
||||
ERLANG_LICENSE = Apache-2.0, MIT
|
||||
ERLANG_LICENSE_FILES = LICENSE
|
||||
ERLANG_REBAR_LICENSE = Apache-2.0, MIT
|
||||
ERLANG_REBAR_LICENSE_FILES = LICENSE
|
||||
|
||||
# We do not have a target variant, so just define the dependencies,
|
||||
# configure and build commands for the host variant.
|
||||
|
||||
@@ -30,7 +30,7 @@ EUDEV_CONF_OPTS += --with-rootlibdir=/lib --enable-split-usr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y)
|
||||
EUDEV_CONF_OPTS += --enable-rule_generator
|
||||
EUDEV_CONF_OPTS += --enable-rule-generator
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EUDEV_ENABLE_HWDB),y)
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 18 Feb 2016 22:32:38 +0100
|
||||
Subject: [PATCH] mouse.cpp: fix musl compile
|
||||
|
||||
Add missing include, fixes:
|
||||
|
||||
mouse.cpp:58:37: error: 'memset' was not declared in this scope
|
||||
mouse.cpp:60:64: error: 'strncpy' was not declared in this scope
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/mouse.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/mouse.cpp b/src/mouse.cpp
|
||||
index 0435dd9..f173137 100644
|
||||
--- a/src/mouse.cpp
|
||||
+++ b/src/mouse.cpp
|
||||
@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse)
|
||||
#include <stddef.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <gpm.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -16,4 +16,11 @@ ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
FBTERM_CONF_ENV += LIBS='-lpthread'
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
FBTERM_DEPENDENCIES += gpm
|
||||
FBTERM_CONF_OPTS += --enable-gpm
|
||||
else
|
||||
FBTERM_CONF_OPTS += --disable-gpm
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -33,8 +33,9 @@ choice
|
||||
config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11
|
||||
bool "X11"
|
||||
depends on BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE # Runtime dependency
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT # Runtime dependency
|
||||
select BR2_PACKAGE_XLIB_LIBXDAMAGE
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
select BR2_PACKAGE_XLIB_LIBXFIXES
|
||||
|
||||
comment "X11 backend needs Xorg package"
|
||||
depends on !BR2_PACKAGE_XORG7
|
||||
|
||||
@@ -22,6 +22,14 @@ IMX_GPU_VIV_REDISTRIBUTE = NO
|
||||
IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg
|
||||
IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT))
|
||||
|
||||
ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11)
|
||||
# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages
|
||||
# may want to link against libGAL.so (QT5 Base with OpenGL and X support
|
||||
# does so). For this to work we need build dependencies to libXdamage,
|
||||
# libXext and libXfixes so that X functions used in libGAL.so are referenced.
|
||||
IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes
|
||||
endif
|
||||
|
||||
define IMX_GPU_VIV_EXTRACT_CMDS
|
||||
$(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE))
|
||||
endef
|
||||
|
||||
@@ -16,6 +16,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
GAWK_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSIGSEGV),y)
|
||||
GAWK_DEPENDENCIES += libsigsegv
|
||||
endif
|
||||
|
||||
# --with-mpfr requires an argument so just let
|
||||
# configure find it automatically
|
||||
ifeq ($(BR2_PACKAGE_MPFR),y)
|
||||
|
||||
@@ -38,6 +38,13 @@ else
|
||||
GNUPG2_CONF_OPTS += --disable-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y)
|
||||
GNUPG2_CONF_OPTS += --enable-ccid-driver
|
||||
GNUPG2_DEPENDENCIES += libusb-compat
|
||||
else
|
||||
GNUPG2_CONF_OPTS += --disable-ccid-driver
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
GNUPG2_CONF_OPTS += --with-readline=$(STAGING_DIR)
|
||||
GNUPG2_DEPENDENCIES += readline
|
||||
|
||||
@@ -17,6 +17,10 @@ GNURADIO_DEPENDENCIES = \
|
||||
host-swig \
|
||||
boost
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GNURADIO_DEPENDENCIES += orc
|
||||
endif
|
||||
|
||||
GNURADIO_CONF_OPTS = \
|
||||
-DENABLE_DEFAULT=OFF \
|
||||
-DENABLE_VOLK=ON \
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Rytarowski <n54@gmx.com>
|
||||
Date: Sat, 4 May 2013 01:30:17 +0200
|
||||
Subject: [PATCH] Install unversioned solibrary
|
||||
|
||||
Unversioned solibraries are shipped with -devel packages in Linux
|
||||
distros. Generate and install it for the consistency.
|
||||
|
||||
[Upstream patch backported from the github repository,
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 6b60ad3..7e9e2ef 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -79,7 +79,7 @@ prog/%: prog/%.o
|
||||
# | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
|
||||
|
||||
# Do it all!
|
||||
-all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
|
||||
+all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
|
||||
|
||||
gpm: $(GOBJ)
|
||||
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
|
||||
@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@: $(PICS)
|
||||
@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)
|
||||
lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@
|
||||
$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
|
||||
-# unneeded, isn't it?
|
||||
-#lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
-# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
+lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
+ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
|
||||
include $(DEPFILE)
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 20 Feb 2016 17:59:52 +0100
|
||||
Subject: [PATCH 1/1] src/Makefile.in: Really install unversioned solibrary
|
||||
|
||||
This commit is a follow-up to
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa
|
||||
which created libgpm.so but failed to include it in the install target.
|
||||
|
||||
Patch sent upstream: https://github.com/telmich/gpm/pull/11
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 7e9e2ef..bca226f 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -115,6 +115,7 @@ install: check
|
||||
if test "x@SHLIB@" != "x" ; then \
|
||||
$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
|
||||
cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
|
||||
+ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \
|
||||
echo "WARNING: We installed a lib, you should now call ldconfig" ; \
|
||||
echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \
|
||||
echo "Or to update everything just type ldconfig" ; \
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -35,6 +35,13 @@ GST1_PLUGINS_GOOD_CONF_OPTS += \
|
||||
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l
|
||||
else
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --without-libv4l2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ORC),y)
|
||||
GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc
|
||||
GST1_PLUGINS_GOOD_DEPENDENCIES += orc
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From: Hilko Bengen <bengen@debian.org>
|
||||
Date: Wed, 27 Apr 2011 00:18:42 +0200
|
||||
Subject: Patched out SSL2 support since it is no longer supported by OpenSSL.
|
||||
|
||||
Now that openssl has dropped SSLv2 support we need to patch it out.
|
||||
Patch picked up from debian patchseries 5.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
|
||||
---
|
||||
mailx.1 | 2 +-
|
||||
openssl.c | 4 +---
|
||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/mailx.1 b/mailx.1
|
||||
index 417ea04..a02e430 100644
|
||||
--- a/mailx.1
|
||||
+++ b/mailx.1
|
||||
@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL.
|
||||
.TP
|
||||
.B ssl-method
|
||||
Selects a SSL/TLS protocol version;
|
||||
-valid values are `ssl2', `ssl3', and `tls1'.
|
||||
+valid values are `ssl3', and `tls1'.
|
||||
If unset, the method is selected automatically,
|
||||
if possible.
|
||||
.TP
|
||||
diff --git a/openssl.c b/openssl.c
|
||||
index b4e33fc..44fe4e5 100644
|
||||
--- a/openssl.c
|
||||
+++ b/openssl.c
|
||||
@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
|
||||
|
||||
cp = ssl_method_string(uhp);
|
||||
if (cp != NULL) {
|
||||
- if (equal(cp, "ssl2"))
|
||||
- method = SSLv2_client_method();
|
||||
- else if (equal(cp, "ssl3"))
|
||||
+ if (equal(cp, "ssl3"))
|
||||
method = SSLv3_client_method();
|
||||
else if (equal(cp, "tls1"))
|
||||
method = TLSv1_client_method();
|
||||
@@ -10,7 +10,7 @@ HOSTAPD_SUBDIR = hostapd
|
||||
HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config
|
||||
HOSTAPD_DEPENDENCIES = host-pkgconf libnl
|
||||
HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/
|
||||
HOSTAPD_LICENSE = GPLv2/BSD-3c
|
||||
HOSTAPD_LICENSE = BSD-3c
|
||||
HOSTAPD_LICENSE_FILES = README
|
||||
HOSTAPD_CONFIG_SET =
|
||||
|
||||
|
||||
@@ -60,6 +60,13 @@ else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LCMS2),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-lcms
|
||||
IMAGEMAGICK_DEPENDENCIES += lcms2
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-lcms
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBPNG),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-png
|
||||
IMAGEMAGICK_DEPENDENCIES += libpng
|
||||
@@ -98,6 +105,13 @@ else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-fftw
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBP),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-webp
|
||||
IMAGEMAGICK_DEPENDENCIES += webp
|
||||
else
|
||||
IMAGEMAGICK_CONF_OPTS += --without-webp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
IMAGEMAGICK_CONF_OPTS += --with-zlib
|
||||
IMAGEMAGICK_DEPENDENCIES += zlib
|
||||
|
||||
@@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
IPROUTE2_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
IPROUTE2_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
# If we've got iptables enable xtables support for tc
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx)
|
||||
IPROUTE2_DEPENDENCIES += iptables
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 8d189e73e660a637ae3f5a604448103ea42e397d Mon Sep 17 00:00:00 2001
|
||||
From: Martin Bark <martin@barkynet.com>
|
||||
Date: Fri, 12 Feb 2016 16:52:19 +0000
|
||||
Subject: [PATCH] ping: link against libm
|
||||
|
||||
This commit links ping against libm because ping.c calls the math library
|
||||
function finite().
|
||||
|
||||
Signed-off-by: Martin Bark <martin@barkynet.com>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 8b37c42..fb80f6f 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -156,7 +156,7 @@ LIB_clockdiff = $(LIB_CAP)
|
||||
DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
|
||||
DEF_ping6_common = $(DEF_CAP) $(DEF_IDN)
|
||||
DEF_ping = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
|
||||
-LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV)
|
||||
+LIB_ping = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) -lm
|
||||
|
||||
ping: ping_common.o ping6_common.o
|
||||
ping.o ping_common.o ping6_common.o: ping.h in6_flowlabel.h
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -10,6 +10,14 @@ JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library)
|
||||
JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python
|
||||
JACK2_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
JACK2_DEPENDENCIES += opus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_READLINE),y)
|
||||
JACK2_DEPENDENCIES += readline
|
||||
endif
|
||||
|
||||
define JACK2_CONFIGURE_CMDS
|
||||
(cd $(@D); \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc
|
||||
sha256 8ae34a9ceb76350954e1e1e3ca9ab51da15862bd5f2fd14392208e60fb454f71 kexec-tools-2.0.9.tar.xz
|
||||
sha256 b1097986ffdb928cf41a94e8a5dfddc981a8fa710cccf13298e7f8dd939a2ee3 kexec-tools-2.0.11.tar.xz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEXEC_VERSION = 2.0.9
|
||||
KEXEC_VERSION = 2.0.11
|
||||
KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz
|
||||
KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec
|
||||
KEXEC_LICENSE = GPLv2
|
||||
@@ -17,6 +17,13 @@ else
|
||||
KEXEC_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
KEXEC_CONF_OPTS += --with-lzma
|
||||
KEXEC_DEPENDENCIES += xz
|
||||
else
|
||||
KEXEC_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
define KEXEC_REMOVE_LIB_TOOLS
|
||||
rm -rf $(TARGET_DIR)/usr/lib/kexec-tools
|
||||
endef
|
||||
|
||||
@@ -15,6 +15,10 @@ KISMET_LICENSE_FILES = debian/copyright
|
||||
# We touch configure.in:
|
||||
KISMET_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
KISMET_DEPENDENCIES += libcap
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
KISMET_DEPENDENCIES += pcre
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 2c15b3931410669f281cd7e183c81e550b7e7221 Mon Sep 17 00:00:00 2001
|
||||
From: Balint Reczey <balint@balintreczey.hu>
|
||||
Date: Wed, 23 Dec 2015 12:55:00 +0100
|
||||
Subject: [PATCH 01/19] Sync enum representation of char_class_e in struct
|
||||
traits with definition
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[backport of upstream patch from master branch:
|
||||
https://github.com/kodi-pvr/pvr.argustv/commit/2c15b3931410669f281cd7e183c81e550b7e7221]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index 0b2afcd..c20600f 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
char begin_char; ///< begin char (or 0 if none)
|
||||
char end_char; ///< end char (or 0 if none)
|
||||
- char char_class[256]; ///< map of char to class
|
||||
+ char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From 7b14e0657a1308e8e133991b778e2fdcb2eb6b9c Mon Sep 17 00:00:00 2001
|
||||
From: Balint Reczey <balint@balintreczey.hu>
|
||||
Date: Wed, 23 Dec 2015 12:55:00 +0100
|
||||
Subject: [PATCH] Sync enum representation of char_class_e in struct traits
|
||||
with definition
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[backport of upstream patch from master branch:
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/commit/7b14e0657a1308e8e133991b778e2fdcb2eb6b9c]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index d2cc949..415e917 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
const char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
const char begin_char; ///< begin char (or 0 if none)
|
||||
const char end_char; ///< end char (or 0 if none)
|
||||
- const char char_class[256]; ///< map of char to class
|
||||
+ const char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -0,0 +1,48 @@
|
||||
From 2698ac4eeca3a82967ff83386460c070ce387ead Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sun, 28 Feb 2016 01:07:52 +0100
|
||||
Subject: [PATCH] Sync enum representation of char_class_e in struct traits
|
||||
with definition
|
||||
|
||||
Copied from
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/28
|
||||
https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/35
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Patch sent upstream: https://github.com/kodi-pvr/pvr.nextpvr/pull/42]
|
||||
---
|
||||
src/uri.h | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/uri.h b/src/uri.h
|
||||
index 2757cf0..3dbca88 100644
|
||||
--- a/src/uri.h
|
||||
+++ b/src/uri.h
|
||||
@@ -21,13 +21,13 @@
|
||||
namespace uri
|
||||
{
|
||||
/// Char class.
|
||||
- enum char_class_e
|
||||
+ typedef enum char_class_e : signed char
|
||||
{
|
||||
CINV = -2, ///< invalid
|
||||
CEND = -1, ///< end delimitor
|
||||
CVAL = 0, ///< valid any position
|
||||
CVA2 = 1, ///< valid anywhere but 1st position
|
||||
- };
|
||||
+ } char_class_e_type;
|
||||
|
||||
/// Traits used for parsing and encoding components.
|
||||
struct traits
|
||||
@@ -35,7 +35,7 @@ namespace uri
|
||||
const char* begin_cstring; ///< begin cstring (or 0 if none)
|
||||
const char begin_char; ///< begin char (or 0 if none)
|
||||
const char end_char; ///< end char (or 0 if none)
|
||||
- char char_class[256]; ///< map of char to class
|
||||
+ const char_class_e_type char_class[256]; ///< map of char to class
|
||||
};
|
||||
|
||||
/**
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -17,6 +17,10 @@ ifneq ($(BR2_STATIC_LIBS),y)
|
||||
LFTP_CONF_OPTS += --with-modules
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT)$(BR2_PACKAGE_LFTP_PROTO_HTTP),yy)
|
||||
LFTP_DEPENDENCIES += expat
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
LFTP_DEPENDENCIES += gnutls
|
||||
LFTP_CONF_OPTS += --with-gnutls
|
||||
|
||||
@@ -42,6 +42,13 @@ else
|
||||
LIBARCHIVE_CONF_OPTS += --disable-xattr
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
LIBARCHIVE_CONF_OPTS += --with-bz2lib
|
||||
LIBARCHIVE_DEPENDENCIES += bzip2
|
||||
else
|
||||
LIBARCHIVE_CONF_OPTS += --without-bz2lib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_EXPAT),y)
|
||||
LIBARCHIVE_DEPENDENCIES += expat
|
||||
else
|
||||
|
||||
@@ -20,6 +20,10 @@ ifeq ($(BR2_arc),y)
|
||||
LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_C_ARES),y)
|
||||
LIBEXOSIP2_DEPENDENCIES += c-ares
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LIBEXOSIP2_DEPENDENCIES += openssl
|
||||
LIBEXOSIP2_CONF_OPTS += --enable-openssl
|
||||
|
||||
104
firmware/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch
Normal file
104
firmware/buildroot/package/libfcgi/0006-fix-CVE-2012-6687.patch
Normal file
@@ -0,0 +1,104 @@
|
||||
libfcgi:add security patch for CVE-2012-6687
|
||||
CVE-2012-6687 - remote attackers cause a denial of service (crash) via a large number
|
||||
of connections (http://www.cvedetails.com/cve/CVE-2012-6687/).
|
||||
Fix:use poll in os_unix.c instead of select to avoid problem with > 1024 connections.
|
||||
This patch libfcgi_2.4.0-8.3.debian.tar.xz is pulled from the below link:
|
||||
(https://launchpad.net/ubuntu/+source/libfcgi/2.4.0-8.3)
|
||||
The next release of libfcgi is 2.4.1 which may have this fix is yet to be released
|
||||
officially.
|
||||
|
||||
Signed-off-by: Anton Kortunov <toshic.toshic@gmail.com>
|
||||
Signed-off-by: Niranjan Reddy <niranjan.reddy@rockwellcollins.com>
|
||||
|
||||
Index: b/libfcgi/os_unix.c
|
||||
===================================================================
|
||||
--- a/libfcgi/os_unix.c
|
||||
+++ b/libfcgi/os_unix.c
|
||||
@@ -42,6 +42,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <sys/un.h>
|
||||
#include <signal.h>
|
||||
+#include <poll.h>
|
||||
|
||||
#ifdef HAVE_NETDB_H
|
||||
#include <netdb.h>
|
||||
@@ -103,6 +104,9 @@
|
||||
static int shutdownPending = FALSE;
|
||||
static int shutdownNow = FALSE;
|
||||
|
||||
+static int libfcgiOsClosePollTimeout = 2000;
|
||||
+static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
|
||||
+
|
||||
void OS_ShutdownPending()
|
||||
{
|
||||
shutdownPending = TRUE;
|
||||
@@ -168,6 +172,16 @@
|
||||
if(libInitialized)
|
||||
return 0;
|
||||
|
||||
+ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
|
||||
+ if(libfcgiOsClosePollTimeoutStr) {
|
||||
+ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
|
||||
+ }
|
||||
+
|
||||
+ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
|
||||
+ if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
|
||||
+ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
|
||||
+ }
|
||||
+
|
||||
asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
|
||||
if(asyncIoTable == NULL) {
|
||||
errno = ENOMEM;
|
||||
@@ -755,19 +769,16 @@
|
||||
|
||||
if (shutdown(fd, 1) == 0)
|
||||
{
|
||||
- struct timeval tv;
|
||||
- fd_set rfds;
|
||||
+ struct pollfd pfd;
|
||||
int rv;
|
||||
char trash[1024];
|
||||
|
||||
- FD_ZERO(&rfds);
|
||||
+ pfd.fd = fd;
|
||||
+ pfd.events = POLLIN;
|
||||
|
||||
do
|
||||
{
|
||||
- FD_SET(fd, &rfds);
|
||||
- tv.tv_sec = 2;
|
||||
- tv.tv_usec = 0;
|
||||
- rv = select(fd + 1, &rfds, NULL, NULL, &tv);
|
||||
+ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
|
||||
}
|
||||
while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
|
||||
}
|
||||
@@ -1116,13 +1127,11 @@
|
||||
*/
|
||||
static int is_af_unix_keeper(const int fd)
|
||||
{
|
||||
- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
|
||||
- fd_set read_fds;
|
||||
-
|
||||
- FD_ZERO(&read_fds);
|
||||
- FD_SET(fd, &read_fds);
|
||||
+ struct pollfd pfd;
|
||||
+ pfd.fd = fd;
|
||||
+ pfd.events = POLLIN;
|
||||
|
||||
- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
|
||||
+ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
Index: b/examples/Makefile.am
|
||||
===================================================================
|
||||
--- a/examples/Makefile.am
|
||||
+++ b/examples/Makefile.am
|
||||
@@ -34,5 +34,5 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@
|
||||
threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
|
||||
|
||||
echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp
|
||||
-echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la
|
||||
+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la
|
||||
@@ -12,4 +12,11 @@ LIBFM_LICENSE = GPLv2+, LGPLv2.1+
|
||||
LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c
|
||||
LIBFM_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEXIF),y)
|
||||
LIBFM_CONF_OPTS += --enable-exif
|
||||
LIBFM_DEPENDENCIES += libexif
|
||||
else
|
||||
LIBFM_CONF_OPTS += --disable-exif
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -107,6 +107,13 @@ ifneq ($(BR2_ENABLE_LOCALE),y)
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
LIBGLIB2_CONF_OPTS += --enable-libelf
|
||||
LIBGLIB2_DEPENDENCIES += elfutils
|
||||
else
|
||||
LIBGLIB2_CONF_OPTS += --disable-libelf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
LIBGLIB2_CONF_OPTS += --with-libiconv=gnu
|
||||
LIBGLIB2_DEPENDENCIES += libiconv
|
||||
|
||||
@@ -18,6 +18,10 @@ define LIBSOIL_EXTRACT_CMDS
|
||||
mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D)
|
||||
endef
|
||||
|
||||
# gnu patch < v2.5.9 doesn't correctly handle spaces in file names,
|
||||
# and we want to patch the 'alternate Makefile.txt' file, so rename
|
||||
# the file (and patch the renamed file) for compatibility with older
|
||||
# distributions
|
||||
define REMOVE_SPACE_FROM_FILENAME
|
||||
cd $(@D)/projects/makefile/ && \
|
||||
mv "alternate Makefile.txt" alternate_Makefile.txt
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# from https://red.libssh.org/projects/libssh/files/
|
||||
md5 5d7d468937649a6dfc6186edfff083db libssh-0.7.2.tar.xz
|
||||
# Locally calculated after checking signature on uncompressed libssh-0.7.2.tar
|
||||
sha256 a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62 libssh-0.7.2.tar.xz
|
||||
md5 05465da8004f3258db946346213209de libssh-0.7.3.tar.xz
|
||||
# Locally calculated after checking signature on uncompressed libssh-0.7.3.tar
|
||||
sha256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 libssh-0.7.3.tar.xz
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH_VERSION = 0.7.2
|
||||
LIBSSH_VERSION = 0.7.3
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://red.libssh.org/attachments/download/177
|
||||
LIBSSH_SITE = https://red.libssh.org/attachments/download/195
|
||||
LIBSSH_LICENSE = LGPLv2.1
|
||||
LIBSSH_LICENSE_FILES = COPYING
|
||||
LIBSSH_INSTALL_STAGING = YES
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 libssh2-1.6.0.tar.gz
|
||||
sha256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 libssh2-1.7.0.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBSSH2_VERSION = 1.6.0
|
||||
LIBSSH2_VERSION = 1.7.0
|
||||
LIBSSH2_SITE = http://www.libssh2.org/download
|
||||
LIBSSH2_LICENSE = BSD
|
||||
LIBSSH2_LICENSE_FILES = COPYING
|
||||
|
||||
@@ -13,7 +13,7 @@ LIBUCI_DEPENDENCIES = libubox
|
||||
ifeq ($(BR2_PACKAGE_LUA_5_1),y)
|
||||
LIBUCI_DEPENDENCIES += lua
|
||||
LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \
|
||||
-DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \
|
||||
-DLUAPATH=/usr/lib/lua/5.1 \
|
||||
-DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include
|
||||
else
|
||||
LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF
|
||||
|
||||
@@ -28,31 +28,67 @@ else
|
||||
LINKS_CONF_OPTS += --without-directfb
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
LINKS_CONF_OPTS += --with-libjpeg
|
||||
LINKS_DEPENDENCIES += jpeg
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libjpeg
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_LIBRSVG),y)
|
||||
LINKS_CONF_OPTS += --with-librsvg
|
||||
LINKS_DEPENDENCIES += librsvg
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-librsvg
|
||||
endif
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
LINKS_CONF_OPTS += --with-libtiff
|
||||
LINKS_DEPENDENCIES += tiff
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libtiff
|
||||
endif
|
||||
else
|
||||
LINKS_CONF_OPTS += --disable-graphics
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BZIP2),y)
|
||||
LINKS_CONF_OPTS += --with-bzip2
|
||||
LINKS_DEPENDENCIES += bzip2
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-bzip2
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
LINKS_CONF_OPTS += --with-gpm
|
||||
LINKS_DEPENDENCIES += gpm
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-gpm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
LINKS_CONF_OPTS += --with-libevent
|
||||
LINKS_DEPENDENCIES += libevent
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-libevent
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
LINKS_CONF_OPTS += --with-ssl --enable-ssl-pkgconfig
|
||||
LINKS_DEPENDENCIES += openssl
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XZ),y)
|
||||
LINKS_CONF_OPTS += --with-lzma
|
||||
LINKS_DEPENDENCIES += xz
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-lzma
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LINKS_CONF_OPTS += --with-zlib
|
||||
LINKS_DEPENDENCIES += zlib
|
||||
else
|
||||
LINKS_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -207,17 +207,17 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.77" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.78" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.110" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.96" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.54" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.14.61" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.10.98" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.55" if BR2_KERNEL_HEADERS_3_12
|
||||
default "3.14.62" if BR2_KERNEL_HEADERS_3_14
|
||||
default "3.17.8" if BR2_KERNEL_HEADERS_3_17
|
||||
default "3.18.27" if BR2_KERNEL_HEADERS_3_18
|
||||
default "3.19.8" if BR2_KERNEL_HEADERS_3_19
|
||||
default "4.0.9" if BR2_KERNEL_HEADERS_4_0
|
||||
default "4.1.18" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.2.8" if BR2_KERNEL_HEADERS_4_2
|
||||
default "4.3.5" if BR2_KERNEL_HEADERS_4_3
|
||||
default "4.4.2" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.3.6" if BR2_KERNEL_HEADERS_4_3
|
||||
default "4.4.3" if BR2_KERNEL_HEADERS_4_4
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
|
||||
@@ -9,14 +9,67 @@
|
||||
|
||||
ifeq ($(BR2_KERNEL_HEADERS_AS_KERNEL),y)
|
||||
|
||||
LINUX_HEADERS_VERSION = none
|
||||
LINUX_HEADERS_SOURCE =
|
||||
LINUX_HEADERS_VERSION = $(call qstrip,$(BR2_LINUX_KERNEL_VERSION))
|
||||
|
||||
LINUX_HEADERS_LICENSE = $(LINUX_LICENSE)
|
||||
LINUX_HEADERS_LICENSE_FILES = $(LINUX_LICENSE_FILES)
|
||||
# Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration
|
||||
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_TARBALL),y)
|
||||
LINUX_HEADERS_TARBALL = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION))
|
||||
LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_TARBALL)))
|
||||
LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_TARBALL))
|
||||
BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_LOCAL),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_LOCAL_PATH))
|
||||
LINUX_HEADERS_SITE_METHOD = local
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_GIT),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
|
||||
LINUX_HEADERS_SITE_METHOD = git
|
||||
# use same git tarball as linux kernel
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
else ifeq ($(BR2_LINUX_KERNEL_CUSTOM_HG),y)
|
||||
LINUX_HEADERS_SITE = $(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_REPO_URL))
|
||||
LINUX_HEADERS_SITE_METHOD = hg
|
||||
# use same hg tarball as linux kernel
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz
|
||||
else
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y)
|
||||
BR_NO_CHECK_HASH_FOR += $(LINUX_HEADERS_SOURCE)
|
||||
endif
|
||||
# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order
|
||||
# to use the $(word) function. We support versions such as 4.0, 3.1,
|
||||
# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc.
|
||||
ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6
|
||||
else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x
|
||||
else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.)
|
||||
LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
|
||||
endif
|
||||
# release candidates are in testing/ subdir
|
||||
ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),)
|
||||
LINUX_HEADERS_SITE := $(LINUX_HEADERS_SITE)/testing
|
||||
endif # -rc
|
||||
endif
|
||||
|
||||
LINUX_HEADERS_PATCH_DEPENDENCIES = linux
|
||||
LINUX_HEADERS_REAL_DIR = $(LINUX_DIR)
|
||||
LINUX_HEADERS_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
|
||||
|
||||
# We rely on the generic package infrastructure to download and apply
|
||||
# remote patches (downloaded from ftp, http or https). For local
|
||||
# patches, we can't rely on that infrastructure, because there might
|
||||
# be directories in the patch list (unlike for other packages).
|
||||
LINUX_HEADERS_PATCH = $(filter ftp://% http://% https://%,$(LINUX_HEADERS_PATCHES))
|
||||
|
||||
define LINUX_HEADERS_APPLY_LOCAL_PATCHES
|
||||
for p in $(filter-out ftp://% http://% https://%,$(LINUX_HEADERS_PATCHES)) ; do \
|
||||
if test -d $$p ; then \
|
||||
$(APPLY_PATCHES) $(@D) $$p \*.patch || exit 1 ; \
|
||||
else \
|
||||
$(APPLY_PATCHES) $(@D) `dirname $$p` `basename $$p` || exit 1; \
|
||||
fi \
|
||||
done
|
||||
endef
|
||||
|
||||
LINUX_HEADERS_POST_PATCH_HOOKS += LINUX_HEADERS_APPLY_LOCAL_PATCHES
|
||||
|
||||
else # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
@@ -30,13 +83,11 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x
|
||||
endif
|
||||
LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz
|
||||
|
||||
endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
LINUX_HEADERS_LICENSE = GPLv2
|
||||
LINUX_HEADERS_LICENSE_FILES = COPYING
|
||||
|
||||
LINUX_HEADERS_REAL_DIR = $(@D)
|
||||
|
||||
endif # ! BR2_KERNEL_HEADERS_AS_KERNEL
|
||||
|
||||
LINUX_HEADERS_INSTALL_STAGING = YES
|
||||
|
||||
# linux-headers is part of the toolchain so disable the toolchain dependency
|
||||
@@ -53,7 +104,7 @@ LINUX_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO
|
||||
# uClibc building. This way uClibc doesn't modify linux headers on installation
|
||||
# of "its" headers
|
||||
define LINUX_HEADERS_CONFIGURE_CMDS
|
||||
(cd $(LINUX_HEADERS_REAL_DIR); \
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
ARCH=$(KERNEL_ARCH) \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
@@ -64,7 +115,7 @@ define LINUX_HEADERS_CONFIGURE_CMDS
|
||||
endef
|
||||
|
||||
define LINUX_HEADERS_INSTALL_STAGING_CMDS
|
||||
(cd $(LINUX_HEADERS_REAL_DIR); \
|
||||
(cd $(@D); \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) \
|
||||
ARCH=$(KERNEL_ARCH) \
|
||||
HOSTCC="$(HOSTCC)" \
|
||||
|
||||
@@ -2,3 +2,4 @@
|
||||
sha256 eb9cc053fa0f1e78685cb695596e73931bfb55d2377e3bc3b8b94aff4c5a489c lshw-B.02.17.tar.gz
|
||||
sha256 2e5a3d63da8475db17fd90969bcb1930cf19d2b8da7be41edeea5c2a53878382 no-private-uint.patch
|
||||
sha256 c8365f7ac8fc7a751c78d89ab446111bb1a235bc977a1b21e1b826c2e62361d1 basename-limits-long-bits.patch
|
||||
sha256 9eba284061574e02a6b162ab20dff07c48693e00f781220ee974ba5c90d1cca9 988f5449791ebf869ab9fa7520463dab4eae3404.patch
|
||||
|
||||
@@ -8,7 +8,8 @@ LSHW_VERSION = B.02.17
|
||||
LSHW_SITE = http://ezix.org/software/files
|
||||
LSHW_PATCH = \
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/basename-limits-long-bits.patch \
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/no-private-uint.patch
|
||||
http://git.alpinelinux.org/cgit/aports/plain/testing/lshw/no-private-uint.patch \
|
||||
https://github.com/lyonel/lshw/commit/988f5449791ebf869ab9fa7520463dab4eae3404.patch
|
||||
LSHW_LICENSE = GPLv2
|
||||
LSHW_LICENSE_FILES = COPYING
|
||||
|
||||
|
||||
@@ -15,4 +15,11 @@ LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \
|
||||
--disable-lua --disable-python \
|
||||
$(if $(BR2_PACKAGE_BASH),,--disable-bash)
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
|
||||
LXC_CONF_OPTS += --enable-seccomp
|
||||
LXC_DEPENDENCIES += libseccomp
|
||||
else
|
||||
LXC_CONF_OPTS += --disable-seccomp
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -20,6 +20,27 @@ else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-alsa
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUPNP),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-upnp
|
||||
MEDIASTREAMER_DEPENDENCIES += libupnp
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-upnp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBVPX),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-vp8
|
||||
MEDIASTREAMER_DEPENDENCIES += libvpx
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-vp8
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPUS),y)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-opus
|
||||
MEDIASTREAMER_DEPENDENCIES += opus
|
||||
else
|
||||
MEDIASTREAMER_CONF_OPTS += --disable-opus
|
||||
endif
|
||||
|
||||
# portaudio backend needs speex as well
|
||||
ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy)
|
||||
MEDIASTREAMER_CONF_OPTS += --enable-portaudio
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
From 76aa4fb62a433e61dc35eefcc3077f0463182d2f Mon Sep 17 00:00:00 2001
|
||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
Date: Tue, 23 Feb 2016 22:43:39 +0100
|
||||
Subject: [PATCH] config.in: fixing wrong MonoPosixHelper location
|
||||
|
||||
This patch remove a wrong prefix for libMonoPosixHelper
|
||||
|
||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
---
|
||||
data/config.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/config.in b/data/config.in
|
||||
index b760176..41495b9 100644
|
||||
--- a/data/config.in
|
||||
+++ b/data/config.in
|
||||
@@ -10,7 +10,7 @@
|
||||
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
- <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
+ <dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001
|
||||
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
Date: Thu, 25 Feb 2016 22:19:31 +0100
|
||||
Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path
|
||||
|
||||
mono_libdir actually leaks host compiler path, fixing
|
||||
by hardcoding correct path for our usecase.
|
||||
|
||||
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
|
||||
---
|
||||
mcs/class/monodoc/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile
|
||||
index 3ebba80..ddc2098 100644
|
||||
--- a/mcs/class/monodoc/Makefile
|
||||
+++ b/mcs/class/monodoc/Makefile
|
||||
@@ -135,7 +135,7 @@ test-local: setup-doc-sources
|
||||
dist-local: Monodoc.Ecma/EcmaUrlParser.cs
|
||||
|
||||
$(the_lib).config: Makefile monodoc.dll.config.in
|
||||
- sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@
|
||||
+ sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@
|
||||
|
||||
Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh
|
||||
$(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS)
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -20,6 +20,6 @@ MRAA_CONF_OPTS += \
|
||||
-DIPK=OFF \
|
||||
-DRPM=OFF \
|
||||
-DENABLEEXAMPLES=OFF \
|
||||
-DTESTS=OFF
|
||||
-DBUILDTESTS=OFF
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -17,6 +17,13 @@ MUTT_DEPENDENCIES += libiconv
|
||||
MUTT_CONF_OPTS += --enable-iconv
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBIDN),y)
|
||||
MUTT_DEPENDENCIES += libidn
|
||||
MUTT_CONF_OPTS += --with-idn
|
||||
else
|
||||
MUTT_CONF_OPTS += --without-idn
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MUTT_IMAP),y)
|
||||
MUTT_CONF_OPTS += --enable-imap
|
||||
else
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
Date: Tue, 2 Feb 2016 10:07:22 +0100
|
||||
Subject: [PATCH] mountd: Add check for 'struct file_handle'
|
||||
|
||||
The code to check if name_to_handle_at() is implemented generates only a
|
||||
warning but with some toolchain it doesn't fail to link (the function must be
|
||||
implemented somewhere).
|
||||
However the "struct file_handle" type is not available.
|
||||
|
||||
So, this patch adds a check for this struct.
|
||||
|
||||
Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
utils/mountd/cache.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 25d2ba4..913a86f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -425,6 +425,7 @@ AC_TYPE_PID_T
|
||||
AC_TYPE_SIZE_T
|
||||
AC_HEADER_TIME
|
||||
AC_STRUCT_TM
|
||||
+AC_CHECK_TYPES([struct file_handle])
|
||||
|
||||
dnl *************************************************************
|
||||
dnl Check for functions
|
||||
diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
|
||||
index 7847446..dc64f6d 100644
|
||||
--- a/utils/mountd/cache.c
|
||||
+++ b/utils/mountd/cache.c
|
||||
@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len)
|
||||
if (count_slashes(p) != count_slashes(parent))
|
||||
return 0;
|
||||
|
||||
-#if HAVE_NAME_TO_HANDLE_AT
|
||||
+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE)
|
||||
struct {
|
||||
struct file_handle fh;
|
||||
unsigned char handle[128];
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -28,6 +28,13 @@ NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd
|
||||
NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-caps
|
||||
NFS_UTILS_DEPENDENCIES += libcap
|
||||
else
|
||||
NFS_UTILS_CONF_OPTS += --disable-caps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
|
||||
NFS_UTILS_CONF_OPTS += --enable-tirpc
|
||||
NFS_UTILS_DEPENDENCIES += libtirpc
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
Use __GLIBC_PREREQ only when __GLIBC__ is defined
|
||||
|
||||
The way __GLIBC_PREREQ() is currently used means that it's evaluated
|
||||
even if __GLIBC__ is not defined. But obviously, __GLIBC_PREREQ will
|
||||
not exist if __GLIBC__ is not defined, causing build failures on C
|
||||
libraries not defining __GLIBC__ such as the musl C library.
|
||||
|
||||
Patch originally taken from:
|
||||
https://github.com/voidlinux/void-packages/blob/master/srcpkgs/numactl/patches/musl.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[Thomas: improve patch description.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
--- a/syscall.c.orig 2014-10-20 16:12:53.000000000 +0200
|
||||
+++ b/syscall.c 2015-06-22 08:13:22.729034702 +0200
|
||||
@@ -115,14 +115,16 @@
|
||||
|
||||
#endif
|
||||
|
||||
-#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 11)
|
||||
+#if defined(__GLIBC__)
|
||||
+# if __GLIBC_PREREQ(2,11)
|
||||
|
||||
/* glibc 2.11 seems to have working 6 argument sycall. Use the
|
||||
glibc supplied syscall in this case.
|
||||
The version cut-off is rather arbitary and could be probably
|
||||
earlier. */
|
||||
|
||||
-#define syscall6 syscall
|
||||
+# define syscall6 syscall
|
||||
+#endif
|
||||
#elif defined(__x86_64__)
|
||||
/* 6 argument calls on x86-64 are often buggy in both glibc and
|
||||
asm/unistd.h. Add a working version here. */
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861 numactl-2.0.11.tar.gz
|
||||
sha256 1f4c813cc8c81fa4dfd0be959457a5c3de8fc3316bbc80de3aa1d9ef9992b2b6 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch
|
||||
sha256 0c4cb6550b46976f2a21087490420b218e62ead7d9b178120ad782d53a7ad3a6 31dc2951c758698bff060aeae8ffd8854616183b.patch
|
||||
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
NUMACTL_VERSION = 2.0.11
|
||||
NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download
|
||||
NUMACTL_PATCH = \
|
||||
https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \
|
||||
https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch
|
||||
NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs)
|
||||
NUMACTL_LICENSE_FILES = README
|
||||
NUMACTL_INSTALL_STAGING = YES
|
||||
|
||||
@@ -5,6 +5,7 @@ config BR2_PACKAGE_OFONO
|
||||
depends on BR2_USE_MMU # dbus, libglib2
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII # libcap-ng
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
select BR2_PACKAGE_LIBCAP_NG
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
@@ -18,5 +19,6 @@ config BR2_PACKAGE_OFONO
|
||||
|
||||
comment "ofono needs a toolchain w/ dynamic library, wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4
|
||||
depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
|
||||
|
||||
@@ -30,6 +30,17 @@ HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2
|
||||
OMNIORB_CONF_OPTS += --disable-longdouble
|
||||
HOST_OMNIORB_CONF_OPTS += --disable-longdouble
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
OMNIORB_CONF_OPTS += --with-openssl
|
||||
OMNIORB_DEPENDENCIES += openssl
|
||||
else
|
||||
OMNIORB_CONF_OPTS += --without-openssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
OMNIORB_DEPENDENCIES += zlib
|
||||
endif
|
||||
|
||||
# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR)
|
||||
# enables building of just the lib and disables building of
|
||||
# tools/apps/services. In some cases the apps/services are still
|
||||
|
||||
@@ -23,6 +23,10 @@ OPENIPMI_CONF_OPTS = \
|
||||
--with-python=no \
|
||||
--with-swig=no
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDBM),y)
|
||||
OPENIPMI_DEPENDENCIES += gdbm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
OPENIPMI_DEPENDENCIES += openssl
|
||||
OPENIPMI_CONF_OPTS += --with-openssl=yes
|
||||
|
||||
@@ -22,8 +22,9 @@ comment "bluez support needs a toolchain w/ wchar, threads, dynamic library"
|
||||
|
||||
config BR2_PACKAGE_OPENOBEX_LIBUSB
|
||||
bool "enable libusb support"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
select BR2_PACKAGE_LIBUSB_COMPAT
|
||||
|
||||
comment "libusb support needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
@@ -36,7 +36,7 @@ OPENOBEX_CONF_OPTS += --disable-bluetooth
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y)
|
||||
OPENOBEX_DEPENDENCIES += libusb
|
||||
OPENOBEX_DEPENDENCIES += libusb-compat
|
||||
OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR)
|
||||
else
|
||||
OPENOBEX_CONF_OPTS += --disable-usb
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://www.openssl.org/source/openssl-1.0.2f.tar.gz.sha256
|
||||
sha256 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c openssl-1.0.2f.tar.gz
|
||||
# From https://www.openssl.org/source/openssl-1.0.2g.tar.gz.sha256
|
||||
sha256 b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 openssl-1.0.2g.tar.gz
|
||||
# Locally computed
|
||||
sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
|
||||
sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENSSL_VERSION = 1.0.2f
|
||||
OPENSSL_VERSION = 1.0.2g
|
||||
OPENSSL_SITE = http://www.openssl.org/source
|
||||
OPENSSL_LICENSE = OpenSSL or SSLeay
|
||||
OPENSSL_LICENSE_FILES = LICENSE
|
||||
|
||||
@@ -10,4 +10,11 @@ PATCH_SITE = $(BR2_GNU_MIRROR)/patch
|
||||
PATCH_LICENSE = GPLv3+
|
||||
PATCH_LICENSE_FILES = COPYING
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ATTR),y)
|
||||
PATCH_CONF_OPTS += --enable-attr
|
||||
PATCH_DEPENDENCIES += attr
|
||||
else
|
||||
PATCH_CONF_OPTS += --disable-attr
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
config BR2_PACKAGE_PAX_UTILS
|
||||
bool "pax-utils"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 # needs PR_SET_NO_NEW_PRIVS
|
||||
help
|
||||
ELF related utils for ELF 32/64 binaries that can check files
|
||||
for security relevant properties.
|
||||
|
||||
http://www.gentoo.org/proj/en/hardened/pax-utils.xml
|
||||
|
||||
comment "pax-utils needs a toolchain w/ headers >= 3.5"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user