* [Buildroot] [PATCH 1/1] dbus: fix dbus symlink removal
From: Peter Korsgaard @ 2017-05-06 8:55 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494031878-2982-1-git-send-email-danomimanchego123@gmail.com>
>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> writes:
> There was already a post-build hook to delete the /var/lib/dbus symlink
> created by buildroot after the package's own installation, to prevent
> a dbus installation error during "make dbus-rebuild". However, this
> misses the case for when one might delete the .stamp_target_installed
> file manually, outside of dbus-rebuild. This can be fixed by changing
> the post-build hook to a pre-install hook. This seems appropriate,
> since it is really addressing an installation issue, not a build issue.
> Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] dbus: fix dbus symlink removal
From: Peter Korsgaard @ 2017-05-06 8:55 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=c2d6c4ac3277e545ef27b3d4f3e6d94e50d76256
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
There was already a post-build hook to delete the /var/lib/dbus symlink
created by buildroot after the package's own installation, to prevent
a dbus installation error during "make dbus-rebuild". However, this
misses the case for when one might delete the .stamp_target_installed
file manually, outside of dbus-rebuild. This can be fixed by changing
the post-build hook to a pre-install hook. This seems appropriate,
since it is really addressing an installation issue, not a build issue.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/dbus/dbus.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index d333b20..ce40329 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -82,7 +82,7 @@ define DBUS_REMOVE_VAR_LIB_DBUS
rm -rf $(TARGET_DIR)/var/lib/dbus
endef
-DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
+DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
define DBUS_REMOVE_DEVFILES
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
^ permalink raw reply related
* [Buildroot] [PATCH v1] poppler: add missing std::vector include for Qt code
From: Peter Korsgaard @ 2017-05-06 8:53 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505211759.1389-1-ps.report@gmx.net>
>>>>> "Peter" == Peter Seiderer <ps.report@gmx.net> writes:
> Fixes [1], [2]:
> ../../poppler/Form.h:544:14: error: ?vector? in namespace ?std? does not name a template type
> const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
> ../../poppler/Form.h:556:8: error: ?vector? in namespace ?std? does not name a template type
> std::vector<Ref> calculateOrder;
> [1] http://autobuild.buildroot.net/results/b749b252f63945f278358dcd76b6e9c55214ccd8
> [2] http://autobuild.buildroot.net/results/92e68defe746eb4852b3a45bb27af2282d3f4c7e
> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Committed, thanks. Don't forget to send the patch upstream.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] poppler: add missing std::vector include for Qt code
From: Peter Korsgaard @ 2017-05-06 8:52 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=cb9af5451cef12efba1e1602f3197415ceb1f1ee
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes [1], [2]:
../../poppler/Form.h:544:14: error: ???vector??? in namespace ???std??? does not name a template type
const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
../../poppler/Form.h:556:8: error: ???vector??? in namespace ???std??? does not name a template type
std::vector<Ref> calculateOrder;
[1] http://autobuild.buildroot.net/results/b749b252f63945f278358dcd76b6e9c55214ccd8
[2] http://autobuild.buildroot.net/results/92e68defe746eb4852b3a45bb27af2282d3f4c7e
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
.../0001-Form-add-missing-std-vector-include.patch | 36 ++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/package/poppler/0001-Form-add-missing-std-vector-include.patch b/package/poppler/0001-Form-add-missing-std-vector-include.patch
new file mode 100644
index 0000000..5bca757
--- /dev/null
+++ b/package/poppler/0001-Form-add-missing-std-vector-include.patch
@@ -0,0 +1,36 @@
+From 156507c6e85ad05256ccba06a710d47d34cd8153 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Fri, 5 May 2017 22:21:19 +0200
+Subject: [PATCH] Form: add missing std::vector include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ ../../poppler/Form.h:544:14: error: ???vector??? in namespace ???std??? does not name a template type
+ const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
+
+ ../../poppler/Form.h:556:8: error: ???vector??? in namespace ???std??? does not name a template type
+ std::vector<Ref> calculateOrder;
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ poppler/Form.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/poppler/Form.h b/poppler/Form.h
+index 8ddb6fe..e0a3a28 100644
+--- a/poppler/Form.h
++++ b/poppler/Form.h
+@@ -27,6 +27,7 @@
+ #include "Annot.h"
+
+ #include <set>
++#include <vector>
+
+ class GooString;
+ class Array;
+--
+2.11.0
+
^ permalink raw reply related
* [Buildroot] [PATCH] package/miraclecast: drop legacy systemd-kdbus select
From: Peter Korsgaard @ 2017-05-06 8:52 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505205451.4664-1-yann.morin.1998@free.fr>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> This options was recently removed and made it to legacy (in 815f7137739)
> but miraclecast still selects it.
> miraclecast builds fine without it, it seems, so just drop the select
> altogether.
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
> Cc: Ryan Barnett <rjbarnet@rockwellcollins.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [git commit] package/miraclecast: drop legacy systemd-kdbus select
From: Peter Korsgaard @ 2017-05-06 8:52 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=552bebcff244db39fde578fd63b2c417e4c0aaec
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
This options was recently removed and made it to legacy (in 815f7137739)
but miraclecast still selects it.
miraclecast builds fine without it, it seems, so just drop the select
altogether.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Cc: Ryan Barnett <rjbarnet@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
package/miraclecast/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/miraclecast/Config.in b/package/miraclecast/Config.in
index 4c6a8aa..57bd57a 100644
--- a/package/miraclecast/Config.in
+++ b/package/miraclecast/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MIRACLECAST
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GSTREAMER1
select BR2_PACKAGE_READLINE
- select BR2_PACKAGE_SYSTEMD_KDBUS
help
The MiracleCast project provides software to connect external
monitors to your system via Wifi. It is compatible to the
^ permalink raw reply related
* [Buildroot] [PATCH] rpi-wifi-firmware: new package
From: Peter Korsgaard @ 2017-05-06 8:50 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170506082758.GD2934@scaer>
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:
> Peter, All,
> On 2017-05-05 20:37 +0200, Peter Korsgaard spake thusly:
>> Add firmware (NVRAM data) for the Raspberry Pi 3 and Zero W wifi module.
>>
>> Notice that linux-firmware provides the main firmware
>> (brcmfmac43430-sdio.bin), but the module also needs board specific
>> configuration (NVRAM) data.
>>
>> For the rpi, this data is available in the RPI firmware-nonfree git repo.
>> As this repo contains a lot of unrelated data (~70MB), simply download the
>> single NVRAM file instead of cloning the entire repo.
>>
>> A similar approach is used by openwrt and opensuse:
>>
>> https://dev.openwrt.org/browser/trunk/package/firmware/brcmfmac43430-firmware/Makefile?rev=49139
>> https://build.opensuse.org/package/view_file/hardware/bcm43xx-firmware/bcm43xx-firmware.spec?rev=b1628448b36c85abc9215eab4785ef29
>>
>> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> [--SNIP--]
>> diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in
>> new file mode 100644
>> index 000000000..2c87c7584
>> --- /dev/null
>> +++ b/package/rpi-wifi-firmware/Config.in
>> @@ -0,0 +1,10 @@
>> +config BR2_PACKAGE_RPI_WIFI_FIRMWARE
>> + bool "rpi-wifi-firmware"
>> + depends on BR2_arm || BR2_aarch64
> I know it read "rpi-wifi-firmware" and thus it is arm or aarch64. But
> can we expect the same chip to be used on a non-arm board?
Posssibly, yes - But then with different nvram settings. See the
opensuse link above for how they handle rpi + a few sunxi boards.
> I would just drop the architecture dependency here, because there is
> nothing specific to the SoC here; the WiFi chip is a secondary chip, so
> could well be present on other boards that are non-arm.
I disagree. I haven't found any detailed documentation, but my
understanding is that this nvram data is board(-family) specific,
E.G. it differs between the sunxi boards. From what I could find, the
rpi0-w uses the same nvram file as rpi3 though.
>> +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
>> @@ -0,0 +1,22 @@
>> +################################################################################
>> +#
>> +# rpi-wifi-firmware
>> +#
>> +################################################################################
>> +
>> +RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7
>> +# brcmfmac43430-sdio.bin comes from linux-firmware
>> +RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt
>> +# git repo contains a lot of unrelated files
>> +RPI_WIFI_FIRMWARE_SITE =
>> https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm
> License?
Yeah, that's where things get complicated. There is no explicit license
given. The other brcm*bin files in linux-firmware are covered by
LICENCE.broadcom_bcm43xx, but the question is if this also applies to
this nvram file.
Maybe we should just do:
RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
Like we do for the bluetooth part.
--
Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH] rpi-wifi-firmware: new package
From: Yann E. MORIN @ 2017-05-06 8:27 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505183741.30214-1-peter@korsgaard.com>
Peter, All,
On 2017-05-05 20:37 +0200, Peter Korsgaard spake thusly:
> Add firmware (NVRAM data) for the Raspberry Pi 3 and Zero W wifi module.
>
> Notice that linux-firmware provides the main firmware
> (brcmfmac43430-sdio.bin), but the module also needs board specific
> configuration (NVRAM) data.
>
> For the rpi, this data is available in the RPI firmware-nonfree git repo.
> As this repo contains a lot of unrelated data (~70MB), simply download the
> single NVRAM file instead of cloning the entire repo.
>
> A similar approach is used by openwrt and opensuse:
>
> https://dev.openwrt.org/browser/trunk/package/firmware/brcmfmac43430-firmware/Makefile?rev=49139
> https://build.opensuse.org/package/view_file/hardware/bcm43xx-firmware/bcm43xx-firmware.spec?rev=b1628448b36c85abc9215eab4785ef29
>
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
[--SNIP--]
> diff --git a/package/rpi-wifi-firmware/Config.in b/package/rpi-wifi-firmware/Config.in
> new file mode 100644
> index 000000000..2c87c7584
> --- /dev/null
> +++ b/package/rpi-wifi-firmware/Config.in
> @@ -0,0 +1,10 @@
> +config BR2_PACKAGE_RPI_WIFI_FIRMWARE
> + bool "rpi-wifi-firmware"
> + depends on BR2_arm || BR2_aarch64
I know it read "rpi-wifi-firmware" and thus it is arm or aarch64. But
can we expect the same chip to be used on a non-arm board?
I would just drop the architecture dependency here, because there is
nothing specific to the SoC here; the WiFi chip is a secondary chip, so
could well be present on other boards that are non-arm.
> + select BR2_PACKAGE_LINUX_FIRMWARE
> + select BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX # runtime
> + help
> + Raspberry Pi 3 and Zero W Broadcom BCM43430 wifi module
> + NVRAM data.
> +
> + https://github.com/RPi-Distro/firmware-nonfree/
> diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
> new file mode 100644
> index 000000000..c20506536
> --- /dev/null
> +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
> @@ -0,0 +1,2 @@
> +# Locally calculated
> +sha256 872fde4f9942d9aba805880d6eaddfe050305626fd58ad955bfe77c04f6b75a5 brcmfmac43430-sdio.txt
> diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
> new file mode 100644
> index 000000000..e90864fae
> --- /dev/null
> +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
> @@ -0,0 +1,22 @@
> +################################################################################
> +#
> +# rpi-wifi-firmware
> +#
> +################################################################################
> +
> +RPI_WIFI_FIRMWARE_VERSION = 54bab3d6a6d43239c71d26464e6e10e5067ffea7
> +# brcmfmac43430-sdio.bin comes from linux-firmware
> +RPI_WIFI_FIRMWARE_SOURCE = brcmfmac43430-sdio.txt
> +# git repo contains a lot of unrelated files
> +RPI_WIFI_FIRMWARE_SITE = https://raw.githubusercontent.com/RPi-Distro/firmware-nonfree/$(RPI_WIFI_FIRMWARE_VERSION)/brcm80211/brcm
License?
Regards,
Yann E. MORIN.
> +define RPI_WIFI_FIRMWARE_EXTRACT_CMDS
> + cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/
> +endef
> +
> +define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
> + $(INSTALL) -D -m 0644 $(@D)/$(RPI_WIFI_FIRMWARE_SOURCE) \
> + $(TARGET_DIR)/lib/firmware/brcm/$(RPI_WIFI_FIRMWARE_SOURCE)
> +endef
> +
> +$(eval $(generic-package))
> --
> 2.11.0
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 3/3] core: add "cmake3" to the list of cmake candidates
From: Yann E. MORIN @ 2017-05-06 8:18 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-4-git-send-email-casantos@datacom.ind.br>
Carlos, All,
On 2017-05-05 17:30 -0300, Carlos Santos spake thusly:
> This is useful on CentOS 7, whose "cmake" utility corresponds to version
> 2.8.12, which is too old for Buildroot.
>
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> support/dependencies/check-host-cmake.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
> index 42aaee4..f2eef8b 100644
> --- a/support/dependencies/check-host-cmake.mk
> +++ b/support/dependencies/check-host-cmake.mk
> @@ -10,7 +10,7 @@
> #
> BR2_CMAKE_VERSION_MIN = 3.1
>
> -BR2_CMAKE_CANDIDATES ?= cmake
> +BR2_CMAKE_CANDIDATES ?= cmake cmake3
> BR2_CMAKE ?= $(call suitable-host-package,cmake,\
> $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
> ifeq ($(BR2_CMAKE),)
> --
> 1.8.3.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
From: Yann E. MORIN @ 2017-05-06 8:17 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1806928464.21765876.1494024222751.JavaMail.zimbra@datacom.ind.br>
Carlos, All,
On 2017-05-05 19:43 -0300, Carlos Santos spake thusly:
> > From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > To: "Carlos Santos" <casantos@datacom.ind.br>
> > Cc: buildroot at buildroot.org
> > Sent: Friday, May 5, 2017 6:09:28 PM
> > Subject: Re: [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
> >> @@ -10,9 +10,10 @@
> >> #
> >> BR2_CMAKE_VERSION_MIN = 3.1
> >>
> >> -BR2_CMAKE ?= cmake
> >> -ifeq ($(call suitable-host-package,cmake,\
> >> - $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
> >> +BR2_CMAKE_CANDIDATES ?= cmake
> >
> > Do not rename the variable; keep it named BR2_CMAKE.
> >
> > It was named as such so that one could do:
> >
> > $ make BR2_CMAKE=/path/to/my/cmake3
> >
> > and we want to keep it as such, so people can override the cmake they
> > want to use.
> >
> > By the way, I hope you knew you could do that, didn't you? ;-)
>
> I did not rename the variable. It is still BR2_CMAKE and you still can
> pass it in the command line (yes, I knew).
>
> >> +BR2_CMAKE ?= $(call suitable-host-package,cmake,\
> ^^^^^^^^^^^^^
Right, I missed the conditional assignment here.
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> >> + $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
> >> +ifeq ($(BR2_CMAKE),)
> >> BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
> >> BR2_CMAKE_HOST_DEPENDENCY = host-cmake
> >> endif
> >> --
> >> 1.8.3.1
>
> --
> Carlos Santos (Casantos) - DATACOM, P&D
> ?The greatest triumph that modern PR can offer is the transcendent
> success of having your words and actions judged by your reputation,
> rather than the other way about.? ? Christopher Hitchens
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
From: Yann E. MORIN @ 2017-05-06 8:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <514021890.21766442.1494026344834.JavaMail.zimbra@datacom.ind.br>
Carlos, All,
On 2017-05-05 20:19 -0300, Carlos Santos spake thusly:
> > From: "Carlos Santos" <casantos@datacom.ind.br>
> > To: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: buildroot at buildroot.org
> > Sent: Friday, May 5, 2017 7:34:46 PM
> > Subject: Re: [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
>
> >> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> >> To: "Carlos Santos" <casantos@datacom.ind.br>
> >> Cc: buildroot at buildroot.org
> >> Sent: Friday, May 5, 2017 6:07:03 PM
> >> Subject: Re: [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check
> >> several candidates
> >>> --- a/support/dependencies/check-host-cmake.sh
> >>> +++ b/support/dependencies/check-host-cmake.sh
> >>> @@ -1,39 +1,41 @@
> >>> #!/bin/sh
> >>>
> >>> -candidate="${1}"
> >>> -version_min="${2}"
> >>> +eval 'version_min="${'${#}'}"'
> >>
> >> It took me a moment to understand what this was doing (and I am known
> >> for being a shell fanboy!).
> >>
> >> Just revert the order options are passed: version first, then
> >> candidates. This will allow you to get rid of this weird construct.
> >>
> >> version_min="${1}"
> >> shift # Keep only candidates
> >
> > I did it that way because all invocations of the "suitable-host-package"
> > macro pass the candidate name as the first argument to the script but I
> > must admit that the script lost some readability.
>
> Also, doing it as you suggest requires modifying check-host-cmake.mk
> in the same patch to change the argument order, which I'd prefer to
> avoid.
Well, yes you'd have to do that, and I think it is totally aceptable
that you change the order of arguments.
And not all checkers already behave the same anyway. The asciidoc one
just ignores its first argument and is passed none; the lzip one only
takes a candidate and no version; ditto the tar one or the xzcat one. So
in fact, the cmake one is the only one to expect a version on its
command line.
So yes, re-ordering the arguments is totally acceptable, and, as I
wrote, make for a simpler code.
Regards,
Yann E. MORIN.
> --
> Carlos Santos (Casantos) - DATACOM, P&D
> ?The greatest triumph that modern PR can offer is the transcendent
> success of having your words and actions judged by your reputation,
> rather than the other way about.? ? Christopher Hitchens
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [autobuild.buildroot.net] Build results for 2017-05-05
From: Thomas Petazzoni @ 2017-05-06 6:28 UTC (permalink / raw)
To: buildroot
Hello,
Build statistics for 2017-05-05
================================
successes : 198
failures : 47
timeouts : 0
TOTAL : 245
Classification of failures by reason
====================================
host-protobuf-3.2.0 | 8
lua-resty-http-legal-info | 5
mpv-0.25.0 | 4
radvd-2.12 | 4
libcdio-0.94 | 3
mpir-3.0.0 | 3
arp-scan-1.9 | 2
nodejs-7.9.0 | 2
protobuf-3.2.0 | 2
toolchain-external-codesour... | 2
bluez_utils-4.101 | 1
busybox-1.26.2 | 1
libepoxy-1.4.1 | 1
lttng-tools-2.9.4 | 1
mplayer-1.3.0 | 1
openocd-0.10.0 | 1
poppler-0.54.0 | 1
qt5base-5.8.0 | 1
quagga-1.1.1 | 1
rabbitmq-c-v0.8.0 | 1
uclibc-ng-test-c9b9876cefc1... | 1
wpan-tools-0.7 | 1
Detail of failures
===================
arm | arp-scan-1.9 | NOK | http://autobuild.buildroot.net/results/4f3381b2369633973f7145332512d052fd04ad18 |
arm | arp-scan-1.9 | NOK | http://autobuild.buildroot.net/results/376fcb4bd9b60a5b4ab845511ba26fcdedf1cd0a |
x86_64 | bluez_utils-4.101 | NOK | http://autobuild.buildroot.net/results/2005ec0835a6db3cd4568a054882ea291d3e5830 |
arm | busybox-1.26.2 | NOK | http://autobuild.buildroot.net/results/30c33dac104866a46ad5b576d9df940648018b03 | ORPH
i686 | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/78e28f0a7fb3b3bb1187d3a7072724d34932f528 | ORPH
powerpc | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/7faa686f5811df90b683ae5dd285a06e97bb4fa5 | ORPH
arm | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/f870f75a8d1cfaf32ae5d0557b70b5bf12166ecd | ORPH
arm | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/7195a8a634e9911e38528920c3d3ddee73082539 | ORPH
arm | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/86b6bd3171bcb3d64c075ec4487028c4ed370e65 | ORPH
microblazeel | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/b2264650fb69b2486e824c8695e9ae8e84cb5293 | ORPH
sparc | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/73a642c04ae3feefe47340eabbce13e018ffde4b | ORPH
arm | host-protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/9d739f22fae243690e9e91ec2fe3e3a3b21b12f8 | ORPH
arc | libcdio-0.94 | NOK | http://autobuild.buildroot.net/results/3fbeefdd4089e469b0547cfd96f78febc3ad5747 |
arc | libcdio-0.94 | NOK | http://autobuild.buildroot.net/results/61ac670d473c7bebafa1d47e5e2a55b29e36da56 |
arc | libcdio-0.94 | NOK | http://autobuild.buildroot.net/results/1133179cf387ef25192611ecb57a6ea692fc18bd |
x86_64 | libepoxy-1.4.1 | NOK | http://autobuild.buildroot.net/results/40b67bbc3fc512aac91724f6b0694b39485a6e18 |
powerpc | lttng-tools-2.9.4 | NOK | http://autobuild.buildroot.net/results/1f7068fd2aeed1603ea26b417742de8591d768d8 |
mips64el | lua-resty-http-legal-info | NOK | http://autobuild.buildroot.net/results/af2fa1d78e159b026e093603f1b3dba6670787f6 |
bfin | lua-resty-http-legal-info | NOK | http://autobuild.buildroot.net/results/c6b60ba4a96cb435b5f7b08d8768d68da389390f |
arm | lua-resty-http-legal-info | NOK | http://autobuild.buildroot.net/results/d33a322b4d2618b55849b5637082100702a91eea |
mipsel | lua-resty-http-legal-info | NOK | http://autobuild.buildroot.net/results/c790816e478df4cf9bbc0239a3b28e3eddb87db6 |
i586 | lua-resty-http-legal-info | NOK | http://autobuild.buildroot.net/results/532c698408ab70c9d4c594c3013af517c51d7caa |
arm | mpir-3.0.0 | NOK | http://autobuild.buildroot.net/results/ad7135b587824d4be9def68c77dc283e6c0ae4dc |
arm | mpir-3.0.0 | NOK | http://autobuild.buildroot.net/results/aad1509a24cafddac797d7555da5d0f3e215d256 |
mips64el | mpir-3.0.0 | NOK | http://autobuild.buildroot.net/results/4a6bd72c2a31154d65a0f9331e890d99c72768c7 |
i686 | mplayer-1.3.0 | NOK | http://autobuild.buildroot.net/results/b33cc4c9bf5de7f7837fd5c612e96cbfb06a61d7 |
xtensa | mpv-0.25.0 | NOK | http://autobuild.buildroot.net/results/65bcff2988971e5b117f8c5032b7deb0364a5e11 |
m68k | mpv-0.25.0 | NOK | http://autobuild.buildroot.net/results/3fbdf264614228a64a7408b8d8dee8087c7d5e02 |
arc | mpv-0.25.0 | NOK | http://autobuild.buildroot.net/results/8ae177eac0be6992361bf370baf0817c3ec0a00e |
mips64el | mpv-0.25.0 | NOK | http://autobuild.buildroot.net/results/0e4efbf21d17d2942f917d24b5b3de3f1009a82c |
arm | nodejs-7.9.0 | NOK | http://autobuild.buildroot.net/results/fcfa38e98c22c8809452f7d0ee86dfe2e9d2482f |
arm | nodejs-7.9.0 | NOK | http://autobuild.buildroot.net/results/946996fa78c7814d1e0ea0ef1239c6eb0c7aa8dd |
m68k | openocd-0.10.0 | NOK | http://autobuild.buildroot.net/results/967c2c432c1a1530702b8d22149ddf57af0d365b | ORPH
microblazeel | poppler-0.54.0 | NOK | http://autobuild.buildroot.net/results/ee92ae3f384934be4ac374b4f7ecb4f1e01e67a1 |
sparc | protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/d6389bdfe4383a885a22f1a41bfc0298b87d47ba | ORPH
sparc | protobuf-3.2.0 | NOK | http://autobuild.buildroot.net/results/d5b10ce97701fff14d797e115e95d1a34304667c | ORPH
sparc64 | qt5base-5.8.0 | NOK | http://autobuild.buildroot.net/results/d1f36b433da8417c66b5bbe65fb71459d0786cb9 |
arc | quagga-1.1.1 | NOK | http://autobuild.buildroot.net/results/e7dbac5addf0f873cef9354eec175a56c1cbcb31 | ORPH
m68k | rabbitmq-c-v0.8.0 | NOK | http://autobuild.buildroot.net/results/9e0b418823474daae03a0d370eebb50c76072bc4 |
arc | radvd-2.12 | NOK | http://autobuild.buildroot.net/results/625ce7b3a591f67c7dd698e8b121bdaa82ef74d4 | ORPH
arc | radvd-2.12 | NOK | http://autobuild.buildroot.net/results/61d17f4872562caffa9f5262ad37e31b97f58f5f | ORPH
powerpc | radvd-2.12 | NOK | http://autobuild.buildroot.net/results/04dfa5b604e68d714d12fea867e9ddf146424914 | ORPH
xtensa | radvd-2.12 | NOK | http://autobuild.buildroot.net/results/8933087d8de49f9dcaf7ce7d841f682316b072d7 | ORPH
x86_64 | toolchain-external-codesour... | NOK | http://autobuild.buildroot.net/results/8795c71f894471619595f838e9f46e3a88429030 | ORPH
x86_64 | toolchain-external-codesour... | NOK | http://autobuild.buildroot.net/results/57c860d878476db2f418ce0151c5b8bf36130889 | ORPH
arm | uclibc-ng-test-c9b9876cefc1... | NOK | http://autobuild.buildroot.net/results/4fc87a4669c92e5e915c67181a9fe4950ba4fccd |
arm | wpan-tools-0.7 | NOK | http://autobuild.buildroot.net/results/7091ad71e743efb5fd530357b0f59c5c2b0e6d8f |
--
http://autobuild.buildroot.net
^ permalink raw reply
* [Buildroot] [PATCH 1/1] dbus: fix dbus symlink removal
From: Danomi Manchego @ 2017-05-06 0:51 UTC (permalink / raw)
To: buildroot
There was already a post-build hook to delete the /var/lib/dbus symlink
created by buildroot after the package's own installation, to prevent
a dbus installation error during "make dbus-rebuild". However, this
misses the case for when one might delete the .stamp_target_installed
file manually, outside of dbus-rebuild. This can be fixed by changing
the post-build hook to a pre-install hook. This seems appropriate,
since it is really addressing an installation issue, not a build issue.
Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
---
package/dbus/dbus.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk
index d333b20..ce40329 100644
--- a/package/dbus/dbus.mk
+++ b/package/dbus/dbus.mk
@@ -82,7 +82,7 @@ define DBUS_REMOVE_VAR_LIB_DBUS
rm -rf $(TARGET_DIR)/var/lib/dbus
endef
-DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
+DBUS_PRE_INSTALL_TARGET_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS
define DBUS_REMOVE_DEVFILES
rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0
--
2.7.4
^ permalink raw reply related
* [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
From: Carlos Santos @ 2017-05-05 23:19 UTC (permalink / raw)
To: buildroot
In-Reply-To: <829990645.21765498.1494023686203.JavaMail.zimbra@datacom.ind.br>
> From: "Carlos Santos" <casantos@datacom.ind.br>
> To: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: buildroot at buildroot.org
> Sent: Friday, May 5, 2017 7:34:46 PM
> Subject: Re: [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
>> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> To: "Carlos Santos" <casantos@datacom.ind.br>
>> Cc: buildroot at buildroot.org
>> Sent: Friday, May 5, 2017 6:07:03 PM
>> Subject: Re: [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check
>> several candidates
>>> --- a/support/dependencies/check-host-cmake.sh
>>> +++ b/support/dependencies/check-host-cmake.sh
>>> @@ -1,39 +1,41 @@
>>> #!/bin/sh
>>>
>>> -candidate="${1}"
>>> -version_min="${2}"
>>> +eval 'version_min="${'${#}'}"'
>>
>> It took me a moment to understand what this was doing (and I am known
>> for being a shell fanboy!).
>>
>> Just revert the order options are passed: version first, then
>> candidates. This will allow you to get rid of this weird construct.
>>
>> version_min="${1}"
>> shift # Keep only candidates
>
> I did it that way because all invocations of the "suitable-host-package"
> macro pass the candidate name as the first argument to the script but I
> must admit that the script lost some readability.
Also, doing it as you suggest requires modifying check-host-cmake.mk
in the same patch to change the argument order, which I'd prefer to
avoid.
--
Carlos Santos (Casantos) - DATACOM, P&D
?The greatest triumph that modern PR can offer is the transcendent
success of having your words and actions judged by your reputation,
rather than the other way about.? ? Christopher Hitchens
^ permalink raw reply
* [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
From: Carlos Santos @ 2017-05-05 22:43 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505210928.GB3001@scaer>
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> To: "Carlos Santos" <casantos@datacom.ind.br>
> Cc: buildroot at buildroot.org
> Sent: Friday, May 5, 2017 6:09:28 PM
> Subject: Re: [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
>> @@ -10,9 +10,10 @@
>> #
>> BR2_CMAKE_VERSION_MIN = 3.1
>>
>> -BR2_CMAKE ?= cmake
>> -ifeq ($(call suitable-host-package,cmake,\
>> - $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
>> +BR2_CMAKE_CANDIDATES ?= cmake
>
> Do not rename the variable; keep it named BR2_CMAKE.
>
> It was named as such so that one could do:
>
> $ make BR2_CMAKE=/path/to/my/cmake3
>
> and we want to keep it as such, so people can override the cmake they
> want to use.
>
> By the way, I hope you knew you could do that, didn't you? ;-)
I did not rename the variable. It is still BR2_CMAKE and you still can
pass it in the command line (yes, I knew).
>> +BR2_CMAKE ?= $(call suitable-host-package,cmake,\
^^^^^^^^^^^^^
>> + $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
>> +ifeq ($(BR2_CMAKE),)
>> BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
>> BR2_CMAKE_HOST_DEPENDENCY = host-cmake
>> endif
>> --
>> 1.8.3.1
--
Carlos Santos (Casantos) - DATACOM, P&D
?The greatest triumph that modern PR can offer is the transcendent
success of having your words and actions judged by your reputation,
rather than the other way about.? ? Christopher Hitchens
^ permalink raw reply
* [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
From: Carlos Santos @ 2017-05-05 22:34 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505210703.GA3001@scaer>
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
> To: "Carlos Santos" <casantos@datacom.ind.br>
> Cc: buildroot at buildroot.org
> Sent: Friday, May 5, 2017 6:07:03 PM
> Subject: Re: [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
>> --- a/support/dependencies/check-host-cmake.sh
>> +++ b/support/dependencies/check-host-cmake.sh
>> @@ -1,39 +1,41 @@
>> #!/bin/sh
>>
>> -candidate="${1}"
>> -version_min="${2}"
>> +eval 'version_min="${'${#}'}"'
>
> It took me a moment to understand what this was doing (and I am known
> for being a shell fanboy!).
>
> Just revert the order options are passed: version first, then
> candidates. This will allow you to get rid of this weird construct.
>
> version_min="${1}"
> shift # Keep only candidates
I did it that way because all invocations of the "suitable-host-package"
macro pass the candidate name as the first argument to the script but I
must admit that the script lost some readability.
>
> So that you can do...
>
>> major_min="${version_min%.*}"
>> minor_min="${version_min#*.}"
> [--SNIP--]
>> +while [ $# -gt 1 ]; do
>> + cmake=`which "${1}" 2>/dev/null`
>
> for cmake; do
> cmake=`which "${cmake}" 2>/dev/null`
>
>> +
>> + if [ -x "${cmake}" ]; then
>
> Please use an early cut:
>
> [ -x "${cmake}" ] || continue
>
> which allows you to gain a indentation level below.
Ok.
--
Carlos Santos (Casantos) - DATACOM, P&D
?The greatest triumph that modern PR can offer is the transcendent
success of having your words and actions judged by your reputation,
rather than the other way about.? ? Christopher Hitchens
^ permalink raw reply
* [Buildroot] Analysis of build results for 2017-05-04
From: Matthew Weber @ 2017-05-05 22:11 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505132423.3602e294@free-electrons.com>
Thomas,
On Fri, May 5, 2017 at 6:24 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Hello,
>
> Usual analysis of build results. Matt, Waldemar, Mario, Adam, Semyon,
> Vicente, Bernd, Martin, Arnout, Peter, there are some issues/questions
> for you below. Thanks!
>
> On Fri, 5 May 2017 08:28:02 +0200 (CEST), Thomas Petazzoni wrote:
>
>> arm | apache-legal-info | NOK | http://autobuild.buildroot.net/results/2564362d01139ca3bf3caa30509ae1c8c21239ef |
>
> This one looks really weird. The build was successful, but the
> legal-info at the end of the build failed, because the Apache httpd
> tarball has disappeared from the download folder. I don't really see
> how this could be happening.
>
> Matt, since this issue occurred on your autobuilder slave, could you
> indicate if you have done some maintenance / manually removed some
> downloaded files ?
Let me check, I have 4 autobuilders setup to share the same archive folder.
<snip>
>> arm | host-ti-cgt-pru-2.1.4 | NOK | http://autobuild.buildroot.net/results/01fccc880ae53a60e03eb1bf8236d5c02c28dada |
>
> chmod +x /accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-1/dl/ti_cgt_pru_2.1.4_linux_installer_x86.bin
> chmod: changing permissions of '/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-1/dl/ti_cgt_pru_2.1.4_linux_installer_x86.bin': Operation not permitted
>
> Matthew: this is a configuration issue on your autobuilder slave. It is
> not normal that we are not allowed to set execution permissions. Could
> you fix this?
Yep, I'll resolve this tonight. Similar issue to above, I'm using a
cached folder for my builds and the autobuilder. I''ll fix the
permissions and separate the dl folders from being shared.
>
>> x86_64 | kvm-unit-tests-5731572b2ac2... | NOK | http://autobuild.buildroot.net/results/68c2fb80a57ed5a7b5ba2cddd91aaf7afcc3476b |
>
> This has been broken for too long on x86-64, I'll disable it.
>
>> arm | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/f92c7cbb26ee25ba709a2a6b0738189b835d4322 | ORPH
>> mipsel | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/b7ded5f81093790ea528738bc3734503576d1cb2 | ORPH
>> nios2 | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/02b3f6bcb2743f529204160e5f1af95a7cf0ba51 | ORPH
>> arm | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/8ca091e02cdbcea1541e8c3d58372cec17705ade | ORPH
>> x86_64 | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/c18967f936310680ed91e8dac6476a026d92dddc | ORPH
>> x86_64 | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/f6e7a44a56270ebd869ac1e7f78b563c908c7b70 | ORPH
>> mipsel | libqmi-1.18.0 | NOK | http://autobuild.buildroot.net/results/4f0eb2af09c92ff4cd7448211ffda432754d4e60 | ORPH
>
> Fixed by
> https://git.buildroot.org/buildroot/commit/?id=4d11848a21d4424a04e8428c4cd3bd5e972aacdf.
>
> Who wants to be in the DEVELOPERS file for this package ?
I'll take it. Want me to submit a patch?
>
>> mips64el | libselinux-2.6 | NOK | http://autobuild.buildroot.net/results/98df2219b99c74f63d214dee5feb77925932f17d |
>
> Python/SWIG issue in SELinux.
>
> Matthew? Adam?
Ah fun, will take a look, I'm starting to not like SWIG :-)
<snip>
>
>> x86_64 | toolchain-external-custom-l... | NOK | http://autobuild.buildroot.net/results/5890a96c4f8324839981ce950241b1c442e80827 | ORPH
>
> This is another instance of legal-info failing on Matthew autobuilder
> instance, because the tarball has disappeared.
>
> Matthew, are you doing something funky like sharing the download
> folders between the different instances ?
Yes, I will separate them out.
-Matt
^ permalink raw reply
* [Buildroot] Analysis of build results for 2017-05-04
From: Peter Seiderer @ 2017-05-05 21:28 UTC (permalink / raw)
To: buildroot
In-Reply-To: <20170505132423.3602e294@free-electrons.com>
On Fri, 5 May 2017 13:24:23 +0200, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
>
> > arm | poppler-0.54.0 | NOK | http://autobuild.buildroot.net/results/b749b252f63945f278358dcd76b6e9c55214ccd8 |
> > i686 | poppler-0.54.0 | NOK | http://autobuild.buildroot.net/results/92e68defe746eb4852b3a45bb27af2282d3f4c7e |
>
> error: 'vector' in namespace 'std' does not name a template type
>
> Happens in the Qt backend. Peter, perhaps you have an idea ?
>
Just a missing include for std::vector, fixed by [1]...
Regards,
Peter
[1] https://patchwork.ozlabs.org/patch/759196/
^ permalink raw reply
* [Buildroot] [PATCH v1] poppler: add missing std::vector include for Qt code
From: Peter Seiderer @ 2017-05-05 21:17 UTC (permalink / raw)
To: buildroot
Fixes [1], [2]:
../../poppler/Form.h:544:14: error: ?vector? in namespace ?std? does not name a template type
const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
../../poppler/Form.h:556:8: error: ?vector? in namespace ?std? does not name a template type
std::vector<Ref> calculateOrder;
[1] http://autobuild.buildroot.net/results/b749b252f63945f278358dcd76b6e9c55214ccd8
[2] http://autobuild.buildroot.net/results/92e68defe746eb4852b3a45bb27af2282d3f4c7e
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
.../0001-Form-add-missing-std-vector-include.patch | 36 ++++++++++++++++++++++
1 file changed, 36 insertions(+)
create mode 100644 package/poppler/0001-Form-add-missing-std-vector-include.patch
diff --git a/package/poppler/0001-Form-add-missing-std-vector-include.patch b/package/poppler/0001-Form-add-missing-std-vector-include.patch
new file mode 100644
index 000000000..5bca75723
--- /dev/null
+++ b/package/poppler/0001-Form-add-missing-std-vector-include.patch
@@ -0,0 +1,36 @@
+From 156507c6e85ad05256ccba06a710d47d34cd8153 Mon Sep 17 00:00:00 2001
+From: Peter Seiderer <ps.report@gmx.net>
+Date: Fri, 5 May 2017 22:21:19 +0200
+Subject: [PATCH] Form: add missing std::vector include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Fixes:
+
+ ../../poppler/Form.h:544:14: error: ?vector? in namespace ?std? does not name a template type
+ const std::vector<Ref> &getCalculateOrder() const { return calculateOrder; }
+
+ ../../poppler/Form.h:556:8: error: ?vector? in namespace ?std? does not name a template type
+ std::vector<Ref> calculateOrder;
+
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ poppler/Form.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/poppler/Form.h b/poppler/Form.h
+index 8ddb6fe..e0a3a28 100644
+--- a/poppler/Form.h
++++ b/poppler/Form.h
+@@ -27,6 +27,7 @@
+ #include "Annot.h"
+
+ #include <set>
++#include <vector>
+
+ class GooString;
+ class Array;
+--
+2.11.0
+
--
2.11.0
^ permalink raw reply related
* [Buildroot] [git commit] lua-resty-http: new package
From: Danomi Manchego @ 2017-05-05 21:16 UTC (permalink / raw)
To: buildroot
In-Reply-To: <87ziers773.fsf@dell.be.48ers.dk>
Peter,
On Fri, May 5, 2017 at 10:34 AM, Peter Korsgaard <peter@korsgaard.com> wrote:
>>>>>> "Danomi" == Danomi Manchego <danomimanchego123@gmail.com> writes:
>
> >> We currently don't have any explicit handling of the nginx-lua
> >> module. You could conceptually do something with the 'nginx additional
> >> modules' (BR2_PACKAGE_NGINX_ADD_MODULES) option, but there's no
> >> guarantee that nginx builds after luajit.
> >>
> >> I guess the proper solution would be to add an explicit nginx-lua
> >> module, similar to what we already have for nginx-dav-ext / nginx-naxsi
> >> / nginx-upload.
>
> > FWIW - that's what we did in our project - an "ngx_lua" package that
> > simply uses generic-package to download and untar the source, and an
> > addition to nginx.mk like this:
>
> > ifeq ($(BR2_PACKAGE_NGX_LUA),y)
> > NGINX_DEPENDENCIES += ngx_lua luainterpreter
>
> ngx_lua (or nginx-lua to follow the naming convention) should probably
> be responsible for pulling in luainterpreter, but OK.
Noted and corrected, thank you.
>> NGINX_CONF_OPTS += --add-module=$(NGX_LUA_DIR)
> > ifeq ($(BR2_PACKAGE_LUAJIT),y)
> > NGINX_CONF_ENV += LUAJIT_LIB=$(STAGING_DIR)/usr/lib
> > LUAJIT_INC=$(STAGING_DIR)/usr/include
> > endif
> > endif
>
> > But then we ended up not actually using ngx_lua at all.
>
> Would you be interested in contributing (and maintaining) such a package
> in BR?
I've not much interested in maintaining it since I consider it a
failed experiment on our part. We don't use it now at all. But I can
do a one-time contribution. Is that okay?
Danomi -
> --
> Bye, Peter Korsgaard
^ permalink raw reply
* [Buildroot] [PATCH 3/3] core: add "cmake3" to the list of cmake candidates
From: Yann E. MORIN @ 2017-05-05 21:10 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-4-git-send-email-casantos@datacom.ind.br>
Carlos, All,
On 2017-05-05 17:30 -0300, Carlos Santos spake thusly:
> This is useful on CentOS 7, whose "cmake" utility corresponds to version
> 2.8.12, which is too old for Buildroot.
>
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> support/dependencies/check-host-cmake.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
> index 42aaee4..f2eef8b 100644
> --- a/support/dependencies/check-host-cmake.mk
> +++ b/support/dependencies/check-host-cmake.mk
> @@ -10,7 +10,7 @@
> #
> BR2_CMAKE_VERSION_MIN = 3.1
>
> -BR2_CMAKE_CANDIDATES ?= cmake
> +BR2_CMAKE_CANDIDATES ?= cmake cmake3
I'm fine with adding this. Except for the variable name, that is. ;-)
Regards,
Yann E. MORIN.
> BR2_CMAKE ?= $(call suitable-host-package,cmake,\
> $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
> ifeq ($(BR2_CMAKE),)
> --
> 1.8.3.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 2/3] core: allow having a list of "cmake" candidates
From: Yann E. MORIN @ 2017-05-05 21:09 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-3-git-send-email-casantos@datacom.ind.br>
Carlos, All,
On 2017-05-05 17:30 -0300, Carlos Santos spake thusly:
> Add the BR2_CMAKE_CANDIDATES variable, containing a list of candidates
> to check and use as BR2_CMAKE, if possible.
>
> This allows using "cmake3" on CentOS 7, whose default cmake corresponds
> to version 2.8.12. Example:
>
> $ make BR2_CMAKE_CANDIDATES="cmake cmake3"
>
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> support/dependencies/check-host-cmake.mk | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
> index 8002278..42aaee4 100644
> --- a/support/dependencies/check-host-cmake.mk
> +++ b/support/dependencies/check-host-cmake.mk
> @@ -10,9 +10,10 @@
> #
> BR2_CMAKE_VERSION_MIN = 3.1
>
> -BR2_CMAKE ?= cmake
> -ifeq ($(call suitable-host-package,cmake,\
> - $(BR2_CMAKE) $(BR2_CMAKE_VERSION_MIN)),)
> +BR2_CMAKE_CANDIDATES ?= cmake
Do not rename the variable; keep it named BR2_CMAKE.
It was named as such so that one could do:
$ make BR2_CMAKE=/path/to/my/cmake3
and we want to keep it as such, so people can override the cmake they
want to use.
By the way, I hope you knew you could do that, didn't you? ;-)
Regards,
Yann E. MORIN.
> +BR2_CMAKE ?= $(call suitable-host-package,cmake,\
> + $(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
> +ifeq ($(BR2_CMAKE),)
> BR2_CMAKE = $(HOST_DIR)/usr/bin/cmake
> BR2_CMAKE_HOST_DEPENDENCY = host-cmake
> endif
> --
> 1.8.3.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH 1/3] core: allow check-host-cmake.sh to check several candidates
From: Yann E. MORIN @ 2017-05-05 21:07 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-2-git-send-email-casantos@datacom.ind.br>
Carlos, All,
On 2017-05-05 17:30 -0300, Carlos Santos spake thusly:
> On CentOS 7 the "cmake" package installs cmake 2.8.12, which is too old
> for us but the "cmake3" package (from EPEL) provides cmake 3.6.3, which
> is good enough.
>
> This change allows passing a list of candidates and the minimal version
> to check-host-cmake.sh. Examples (on CentOS 7):
>
> $ sh support/dependencies/check-host-cmake.sh cmake cmake3 2.8
> /usr/bin/cmake
>
> $ sh support/dependencies/check-host-cmake.sh cmake cmake3 3.1
> /usr/bin/cmake3
>
> $ sh support/dependencies/check-host-cmake.sh cmake cmake3 3.8
>
> Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
> ---
> support/dependencies/check-host-cmake.sh | 66 ++++++++++++++++----------------
> 1 file changed, 34 insertions(+), 32 deletions(-)
>
> diff --git a/support/dependencies/check-host-cmake.sh b/support/dependencies/check-host-cmake.sh
> index 9b63b06..09ae8cc 100755
> --- a/support/dependencies/check-host-cmake.sh
> +++ b/support/dependencies/check-host-cmake.sh
> @@ -1,39 +1,41 @@
> #!/bin/sh
>
> -candidate="${1}"
> -version_min="${2}"
> +eval 'version_min="${'${#}'}"'
It took me a moment to understand what this was doing (and I am known
for being a shell fanboy!).
Just revert the order options are passed: version first, then
candidates. This will allow you to get rid of this weird construct.
version_min="${1}"
shift # Keep only candidates
So that you can do...
> major_min="${version_min%.*}"
> minor_min="${version_min#*.}"
[--SNIP--]
> +while [ $# -gt 1 ]; do
> + cmake=`which "${1}" 2>/dev/null`
for cmake; do
cmake=`which "${cmake}" 2>/dev/null`
> +
> + if [ -x "${cmake}" ]; then
Please use an early cut:
[ -x "${cmake}" ] || continue
which allows you to gain a indentation level below.
> + # Extract version X.Y from versions in the form X.Y or X.Y.Z
> + # with X, Y and Z numbers with one or more digits each, e.g.
> + # 3.2 -> 3.2
> + # 3.2.3 -> 3.2
> + # 3.2.42 -> 3.2
> + # 3.10 -> 3.10
> + # 3.10.4 -> 3.10
> + # 3.10.42 -> 3.10
> + version="$(${cmake} --version \
> + |sed -r -e '/.* ([[:digit:]]+\.[[:digit:]]+).*$/!d;' \
> + -e 's//\1/'
> + )"
> + major="${version%.*}"
> + minor="${version#*.}"
> +
> + if [ ${major} -gt ${major_min} ]; then
> + echo "${cmake}"
> + exit
> + elif [ ${major} -eq ${major_min} -a ${minor} -ge ${minor_min} ]; then
> + echo "${cmake}"
> + exit
> + fi
> fi
> -fi
> +
> + shift
> +done
> +
> +# echo nothing: no suitable cmake found
> +exit 1
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply
* [Buildroot] [PATCH] package/miraclecast: drop legacy systemd-kdbus select
From: Yann E. MORIN @ 2017-05-05 20:54 UTC (permalink / raw)
To: buildroot
This options was recently removed and made it to legacy (in 815f7137739)
but miraclecast still selects it.
miraclecast builds fine without it, it seems, so just drop the select
altogether.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Cc: Ryan Barnett <rjbarnet@rockwellcollins.com>
---
package/miraclecast/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/miraclecast/Config.in b/package/miraclecast/Config.in
index 4c6a8aaa07..57bd57a97b 100644
--- a/package/miraclecast/Config.in
+++ b/package/miraclecast/Config.in
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MIRACLECAST
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GSTREAMER1
select BR2_PACKAGE_READLINE
- select BR2_PACKAGE_SYSTEMD_KDBUS
help
The MiracleCast project provides software to connect external
monitors to your system via Wifi. It is compatible to the
--
2.11.0
^ permalink raw reply related
* [Buildroot] [PATCH 3/3] core: add "cmake3" to the list of cmake candidates
From: Carlos Santos @ 2017-05-05 20:30 UTC (permalink / raw)
To: buildroot
In-Reply-To: <1494016231-50639-1-git-send-email-casantos@datacom.ind.br>
This is useful on CentOS 7, whose "cmake" utility corresponds to version
2.8.12, which is too old for Buildroot.
Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
---
support/dependencies/check-host-cmake.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/dependencies/check-host-cmake.mk b/support/dependencies/check-host-cmake.mk
index 42aaee4..f2eef8b 100644
--- a/support/dependencies/check-host-cmake.mk
+++ b/support/dependencies/check-host-cmake.mk
@@ -10,7 +10,7 @@
#
BR2_CMAKE_VERSION_MIN = 3.1
-BR2_CMAKE_CANDIDATES ?= cmake
+BR2_CMAKE_CANDIDATES ?= cmake cmake3
BR2_CMAKE ?= $(call suitable-host-package,cmake,\
$(BR2_CMAKE_CANDIDATES) $(BR2_CMAKE_VERSION_MIN))
ifeq ($(BR2_CMAKE),)
--
1.8.3.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox