Merge branch 'next'

This commit is contained in:
Thomas Petazzoni 2017-09-02 15:10:48 +02:00
commit 29ace1e216
233 changed files with 1807 additions and 1182 deletions

View File

@ -120,7 +120,9 @@ grinn_chiliboard_defconfig: *defconfig
grinn_liteboard_defconfig: *defconfig grinn_liteboard_defconfig: *defconfig
imx23evk_defconfig: *defconfig imx23evk_defconfig: *defconfig
imx6q-sabresd_defconfig: *defconfig imx6q-sabresd_defconfig: *defconfig
imx6q-sabresd_qt5_defconfig: *defconfig
imx6ulpico_defconfig: *defconfig imx6ulpico_defconfig: *defconfig
imx7dpico_defconfig: *defconfig
lego_ev3_defconfig: *defconfig lego_ev3_defconfig: *defconfig
linksprite_pcduino_defconfig: *defconfig linksprite_pcduino_defconfig: *defconfig
minnowboard_max-graphical_defconfig: *defconfig minnowboard_max-graphical_defconfig: *defconfig
@ -205,6 +207,7 @@ toradex_apalis_imx6_defconfig: *defconfig
ts4800_defconfig: *defconfig ts4800_defconfig: *defconfig
ts4900_defconfig: *defconfig ts4900_defconfig: *defconfig
ts5x00_defconfig: *defconfig ts5x00_defconfig: *defconfig
ts7680_defconfig: *defconfig
wandboard_defconfig: *defconfig wandboard_defconfig: *defconfig
warp7_defconfig: *defconfig warp7_defconfig: *defconfig
warpboard_defconfig: *defconfig warpboard_defconfig: *defconfig

View File

@ -178,6 +178,7 @@ F: package/daemon/
F: package/ebtables/ F: package/ebtables/
F: package/openipmi/ F: package/openipmi/
F: package/ti-uim/ F: package/ti-uim/
F: package/uhubctl/
N: Ben Boeckel <mathstuf@gmail.com> N: Ben Boeckel <mathstuf@gmail.com>
F: package/taskd/ F: package/taskd/
@ -326,6 +327,9 @@ N: Bogdan Radulescu <bogdan@nimblex.net>
F: package/iftop/ F: package/iftop/
F: package/ncdu/ F: package/ncdu/
N: Brock Williams <brock@cottonwoodcomputer.com>
F: package/pdmenu/
N: Bryan Brinsko <bryan.brinsko@rockwellcollins.com> N: Bryan Brinsko <bryan.brinsko@rockwellcollins.com>
F: package/pps-tools/ F: package/pps-tools/
@ -543,6 +547,7 @@ F: package/supertuxkart/
N: Fabio Estevam <festevam@gmail.com> N: Fabio Estevam <festevam@gmail.com>
F: board/warp7/ F: board/warp7/
F: configs/freescale_imx* F: configs/freescale_imx*
F: configs/imx6q-sabresd*
F: configs/imx6ulpico_defconfig F: configs/imx6ulpico_defconfig
F: configs/mx6cubox_defconfig F: configs/mx6cubox_defconfig
F: configs/mx6sx_udoo_neo_defconfig F: configs/mx6sx_udoo_neo_defconfig
@ -947,6 +952,9 @@ F: package/libuio/
F: package/netsniff-ng/ F: package/netsniff-ng/
F: package/rabbitmq-c/ F: package/rabbitmq-c/
N: Joshua Henderson <joshua.henderson@microchip.com>
F: package/qt5/qt5wayland/
N: Juha Rantanen <juha@codercoded.com> N: Juha Rantanen <juha@codercoded.com>
F: package/acsccid/ F: package/acsccid/
@ -1428,6 +1436,9 @@ N: Rico Bachmann <bachmann@tofwerk.com>
F: package/apr-util/ F: package/apr-util/
F: package/subversion/ F: package/subversion/
N: RJ Ascani <rj.ascani@gmail.com>
F: package/azmq/
N: Rodrigo Rebello <rprebello@gmail.com> N: Rodrigo Rebello <rprebello@gmail.com>
F: package/chocolate-doom/ F: package/chocolate-doom/
F: package/irssi/ F: package/irssi/

View File

@ -0,0 +1,4 @@
# Currently kernel mainline exhibits issues when running cpufreq as ondemand
# governor on mx6.
# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

View File

@ -54,4 +54,27 @@ To boot your newly created system:
emulator at 115200 bps, 8n1; emulator at 115200 bps, 8n1;
- power on the board. - power on the board.
Testing graphics on the i.MX6Q Sabre SD board
=============================================
The imx6q-sabresd_qt5_defconfig allows to quickly test the graphics
capabilities of i.MX6 using the opensource Etnaviv graphics stack
and kernel mainline.
In order to build it:
make imx6q-sabresd_qt5_defconfig
make
Then flash the SD card as explained above.
Running kmscube application:
# kmscube -D /dev/dri/card1
Running Qt5 Cinematic Demo:
# export QT_QPA_EGLFS_KMS_CONFIG=/root/sabresd.json
# /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience
Enjoy! Enjoy!

View File

@ -0,0 +1,15 @@
{
"device": "/dev/dri/card1",
"hwcursor": false,
"pbuffers": true,
"outputs": [
{
"name": "HDMI-1",
"mode": "off"
},
{
"name": "LVDS-1",
"mode": "1024x768"
}
]
}

View File

@ -0,0 +1,430 @@
From 23c787a99ff7b42f594722d60ea064534fe54a71 Mon Sep 17 00:00:00 2001
From: Vanessa Maegima <vanessa.maegima@nxp.com>
Date: Wed, 17 May 2017 14:06:36 -0300
Subject: [PATCH] ARM: dts: imx7d-pico: Add initial support
Add the initial support for imx7d-pico board.
Add support for eMMC, USB host, USB device, PMIC, Ethernet and audio.
For more information about this board, please visit:
http://www.technexion.org/products/pico/pico-som/pico-imx7-emmc
Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=23c787a99ff7b42f594722d60ea064534fe54a71
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/imx7d-pico.dts | 387 +++++++++++++++++++++++++++++++++++++++
2 files changed, 388 insertions(+)
create mode 100644 arch/arm/boot/dts/imx7d-pico.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7881aae..cc12670 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -478,6 +478,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
imx7d-cl-som-imx7.dtb \
imx7d-colibri-eval-v3.dtb \
imx7d-nitrogen7.dtb \
+ imx7d-pico.dtb \
imx7d-sbc-imx7.dtb \
imx7d-sdb.dtb \
imx7d-sdb-sht11.dtb \
diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dts
new file mode 100644
index 0000000..ebda3df
--- /dev/null
+++ b/arch/arm/boot/dts/imx7d-pico.dts
@@ -0,0 +1,387 @@
+/*
+ * Copyright 2017 NXP
+ *
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
+ *
+ * a) This file is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/dts-v1/;
+
+#include "imx7d.dtsi"
+
+/ {
+ model = "Technexion Pico i.MX7D Board";
+ compatible = "technexion,imx7d-pico", "fsl,imx7d";
+
+ memory {
+ reg = <0x80000000 0x80000000>;
+ };
+
+ reg_2p5v: regulator-2p5v {
+ compatible = "regulator-fixed";
+ regulator-name = "2P5V";
+ regulator-min-microvolt = <2500000>;
+ regulator-max-microvolt = <2500000>;
+ regulator-always-on;
+ };
+
+ reg_3p3v: regulator-3p3v {
+ compatible = "regulator-fixed";
+ regulator-name = "3P3V";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg1_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ gpio = <&gpio4 5 GPIO_ACTIVE_LOW>;
+ };
+
+ reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
+ compatible = "regulator-fixed";
+ regulator-name = "usb_otg2_vbus";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ };
+
+ reg_vref_1v8: regulator-vref-1v8 {
+ compatible = "regulator-fixed";
+ regulator-name = "vref-1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ };
+
+ sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "imx7-sgtl5000";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,bitclock-master = <&dailink_master>;
+ simple-audio-card,frame-master = <&dailink_master>;
+ simple-audio-card,cpu {
+ sound-dai = <&sai1>;
+ };
+
+ dailink_master: simple-audio-card,codec {
+ sound-dai = <&codec>;
+ clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ };
+ };
+};
+
+&fec1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_enet1>;
+ assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
+ <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
+ assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
+ assigned-clock-rates = <0>, <100000000>;
+ phy-mode = "rgmii";
+ phy-handle = <&ethphy0>;
+ fsl,magic-packet;
+ status = "okay";
+
+ mdio {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ ethphy0: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ status = "okay";
+ };
+ };
+};
+
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "okay";
+
+ codec: sgtl5000@0a {
+ #sound-dai-cells = <0>;
+ reg = <0x0a>;
+ compatible = "fsl,sgtl5000";
+ clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+ VDDA-supply = <&reg_2p5v>;
+ VDDIO-supply = <&reg_vref_1v8>;
+ };
+};
+
+&i2c4 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c4>;
+ status = "okay";
+
+ pmic: pfuze3000@08 {
+ compatible = "fsl,pfuze3000";
+ reg = <0x08>;
+
+ regulators {
+ sw1a_reg: sw1a {
+ regulator-min-microvolt = <700000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+ /* use sw1c_reg to align with pfuze100/pfuze200 */
+ sw1c_reg: sw1b {
+ regulator-min-microvolt = <700000>;
+ regulator-max-microvolt = <1475000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw2_reg: sw2 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1850000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw3a_reg: sw3 {
+ regulator-min-microvolt = <900000>;
+ regulator-max-microvolt = <1650000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ swbst_reg: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ };
+
+ snvs_reg: vsnvs {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vref_reg: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen1_reg: vldo1 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen2_reg: vldo2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ };
+
+ vgen3_reg: vccsd {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen4_reg: v33 {
+ regulator-min-microvolt = <2850000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen5_reg: vldo3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen6_reg: vldo4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
+ };
+};
+
+&sai1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_sai1>;
+ assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
+ <&clks IMX7D_SAI1_ROOT_CLK>;
+ assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
+ assigned-clock-rates = <0>, <24576000>;
+ status = "okay";
+};
+
+&uart5 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_uart5>;
+ assigned-clocks = <&clks IMX7D_UART5_ROOT_SRC>;
+ assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
+ status = "okay";
+};
+
+&usbotg1 {
+ vbus-supply = <&reg_usb_otg1_vbus>;
+ status = "okay";
+};
+
+&usbotg2 {
+ vbus-supply = <&reg_usb_otg2_vbus>;
+ dr_mode = "host";
+ status = "okay";
+};
+
+&usdhc3 {
+ pinctrl-names = "default", "state_100mhz", "state_200mhz";
+ pinctrl-0 = <&pinctrl_usdhc3>;
+ pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
+ pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
+ assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
+ assigned-clock-rates = <400000000>;
+ bus-width = <8>;
+ fsl,tuning-step = <2>;
+ non-removable;
+ status = "okay";
+};
+
+&iomuxc {
+ pinctrl_enet1: enet1grp {
+ fsl,pins = <
+ MX7D_PAD_SD2_CD_B__ENET1_MDIO 0x3
+ MX7D_PAD_SD2_WP__ENET1_MDC 0x3
+ MX7D_PAD_ENET1_RGMII_TXC__ENET1_RGMII_TXC 0x1
+ MX7D_PAD_ENET1_RGMII_TD0__ENET1_RGMII_TD0 0x1
+ MX7D_PAD_ENET1_RGMII_TD1__ENET1_RGMII_TD1 0x1
+ MX7D_PAD_ENET1_RGMII_TD2__ENET1_RGMII_TD2 0x1
+ MX7D_PAD_ENET1_RGMII_TD3__ENET1_RGMII_TD3 0x1
+ MX7D_PAD_ENET1_RGMII_TX_CTL__ENET1_RGMII_TX_CTL 0x1
+ MX7D_PAD_ENET1_RGMII_RXC__ENET1_RGMII_RXC 0x1
+ MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 0x1
+ MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x1
+ MX7D_PAD_ENET1_RGMII_RD2__ENET1_RGMII_RD2 0x1
+ MX7D_PAD_ENET1_RGMII_RD3__ENET1_RGMII_RD3 0x1
+ MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x1
+ >;
+ };
+
+ pinctrl_i2c1: i2c1grp {
+ fsl,pins = <
+ MX7D_PAD_UART1_TX_DATA__I2C1_SDA 0x4000007f
+ MX7D_PAD_UART1_RX_DATA__I2C1_SCL 0x4000007f
+ >;
+ };
+
+ pinctrl_i2c4: i2c4grp {
+ fsl,pins = <
+ MX7D_PAD_SAI1_RX_BCLK__I2C4_SDA 0x4000007f
+ MX7D_PAD_SAI1_RX_SYNC__I2C4_SCL 0x4000007f
+ >;
+ };
+
+ pinctrl_sai1: sai1grp {
+ fsl,pins = <
+ MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK 0x1f
+ MX7D_PAD_ENET1_CRS__SAI1_TX_SYNC 0x1f
+ MX7D_PAD_ENET1_COL__SAI1_TX_DATA0 0x30
+ MX7D_PAD_ENET1_TX_CLK__SAI1_RX_DATA0 0x1f
+ >;
+ };
+
+ pinctrl_uart5: uart5grp {
+ fsl,pins = <
+ MX7D_PAD_I2C4_SDA__UART5_DCE_TX 0x79
+ MX7D_PAD_I2C4_SCL__UART5_DCE_RX 0x79
+ >;
+ };
+
+ pinctrl_usbotg1_pwr: usbotg_pwr {
+ fsl,pins = <
+ MX7D_PAD_UART3_TX_DATA__GPIO4_IO5 0x14
+ >;
+ };
+
+ pinctrl_usdhc3: usdhc3grp {
+ fsl,pins = <
+ MX7D_PAD_SD3_CMD__SD3_CMD 0x59
+ MX7D_PAD_SD3_CLK__SD3_CLK 0x19
+ MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59
+ MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59
+ MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59
+ MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59
+ MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59
+ MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59
+ MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59
+ MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59
+ >;
+ };
+
+ pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
+ fsl,pins = <
+ MX7D_PAD_SD3_CMD__SD3_CMD 0x5a
+ MX7D_PAD_SD3_CLK__SD3_CLK 0x1a
+ MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a
+ MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a
+ MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a
+ MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a
+ MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a
+ MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a
+ MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a
+ MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a
+ >;
+ };
+
+ pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
+ fsl,pins = <
+ MX7D_PAD_SD3_CMD__SD3_CMD 0x5b
+ MX7D_PAD_SD3_CLK__SD3_CLK 0x1b
+ MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b
+ MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b
+ MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b
+ MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b
+ MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b
+ MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b
+ MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b
+ MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b
+ >;
+ };
+};
--
2.7.4

View File

@ -0,0 +1,49 @@
From d1ceec2a8f6ab1b35c296c3339127adca1ace30b Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Tue, 23 May 2017 12:16:08 -0300
Subject: [PATCH] ARM: dts: imx7d-pico: Add watchdog support
imx7d-pico has the WDOG1_B pin connected to the PMIC, so add the
wdog1 node and use the 'fsl,ext-reset-output' property to
properly describe it.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d1ceec2a8f6ab1b35c296c3339127adca1ace30b
---
arch/arm/boot/dts/imx7d-pico.dts | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dts
index ebda3df..f874352 100644
--- a/arch/arm/boot/dts/imx7d-pico.dts
+++ b/arch/arm/boot/dts/imx7d-pico.dts
@@ -284,6 +284,13 @@
status = "okay";
};
+&wdog1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_wdog>;
+ fsl,ext-reset-output;
+ status = "okay";
+};
+
&iomuxc {
pinctrl_enet1: enet1grp {
fsl,pins = <
@@ -385,3 +392,11 @@
>;
};
};
+
+&iomuxc_lpsr {
+ pinctrl_wdog: wdoggrp {
+ fsl,pins = <
+ MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
+ >;
+ };
+};
--
2.7.4

View File

@ -0,0 +1,34 @@
From bdc111bd50cc1378e113647dc251689636986d84 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Tue, 23 May 2017 12:16:09 -0300
Subject: [PATCH] ARM: dts: imx7d-pico: Pass 'no-1-8-v' property to the eMMC
Currently the following eMMC error is seen:
mmc1: mmc_select_hs200 failed, error -74
On imx7d-pico the eMMC VCCQ is fixed at 3.15V, so pass the 'no-1-8-v'
property to properly describe that 1.8V operation is not possible.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=bdc111bd50cc1378e113647dc251689636986d84
---
arch/arm/boot/dts/imx7d-pico.dts | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dts
index f874352..79b5d83 100644
--- a/arch/arm/boot/dts/imx7d-pico.dts
+++ b/arch/arm/boot/dts/imx7d-pico.dts
@@ -279,6 +279,7 @@
assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
assigned-clock-rates = <400000000>;
bus-width = <8>;
+ no-1-8-v;
fsl,tuning-step = <2>;
non-removable;
status = "okay";
--
2.7.4

View File

@ -0,0 +1,90 @@
From 37de44f238d37c96ab1fec8c88b6d207f5b85635 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Sat, 27 May 2017 10:17:52 -0300
Subject: [PATCH] ARM: dts: imx7: Fix typo in watchdog pin name
Change "WDOD1" to "WDOG1" in watchdog pin names.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=37de44f238d37c96ab1fec8c88b6d207f5b85635
---
arch/arm/boot/dts/imx7d-nitrogen7.dts | 2 +-
arch/arm/boot/dts/imx7d-pico.dts | 2 +-
arch/arm/boot/dts/imx7d-pinfunc.h | 6 +++---
arch/arm/boot/dts/imx7d-sdb.dts | 2 +-
arch/arm/boot/dts/imx7s-warp.dts | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index dd40e49..e799830 100644
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -738,7 +738,7 @@
pinctrl_wdog1: wdog1grp {
fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x75
+ MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x75
>;
};
};
diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dts
index 79b5d83..e78c2c9 100644
--- a/arch/arm/boot/dts/imx7d-pico.dts
+++ b/arch/arm/boot/dts/imx7d-pico.dts
@@ -397,7 +397,7 @@
&iomuxc_lpsr {
pinctrl_wdog: wdoggrp {
fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
+ MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74
>;
};
};
diff --git a/arch/arm/boot/dts/imx7d-pinfunc.h b/arch/arm/boot/dts/imx7d-pinfunc.h
index f6f7e78..f2493bc 100644
--- a/arch/arm/boot/dts/imx7d-pinfunc.h
+++ b/arch/arm/boot/dts/imx7d-pinfunc.h
@@ -17,9 +17,9 @@
#define MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0 0x0000 0x0030 0x0000 0x0 0x0
#define MX7D_PAD_LPSR_GPIO1_IO00__PWM4_OUT 0x0000 0x0030 0x0000 0x1 0x0
-#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_ANY 0x0000 0x0030 0x0000 0x2 0x0
-#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x0000 0x0030 0x0000 0x3 0x0
-#define MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG__RST_B_DEB 0x0000 0x0030 0x0000 0x4 0x0
+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_ANY 0x0000 0x0030 0x0000 0x2 0x0
+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x0000 0x0030 0x0000 0x3 0x0
+#define MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG__RST_B_DEB 0x0000 0x0030 0x0000 0x4 0x0
#define MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1 0x0004 0x0034 0x0000 0x0 0x0
#define MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT 0x0004 0x0034 0x0000 0x1 0x0
#define MX7D_PAD_LPSR_GPIO1_IO01__CCM_ENET_REF_CLK3 0x0004 0x0034 0x0000 0x2 0x0
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 77c400f..4a4b522 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -660,7 +660,7 @@
&iomuxc_lpsr {
pinctrl_wdog: wdoggrp {
fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
+ MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74
>;
};
diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 8dfed85..07b63f8 100644
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -443,7 +443,7 @@
&iomuxc_lpsr {
pinctrl_wdog: wdoggrp {
fsl,pins = <
- MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74
+ MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74
>;
};
};
--
2.7.4

View File

@ -0,0 +1,59 @@
****************************
Technexion i.MX7D Pico board
****************************
This file documents the Buildroot support for the Technexion i.MX7D Pico board.
Build
=====
First, configure Buildroot for the i.MX7D Pico board:
make imx7dpico_defconfig
Build all components:
make
You will find in output/images/ the following files:
- imx7d-pico.dtb
- rootfs.ext4
- rootfs.tar
- sdcard.img
- u-boot.imx
- zImage
Flash the eMMC
==============
In the U-Boot prompt lauch:
=> ums 0 mmc 0
This will mount the eMMC content in the host PC as a mass storage device.
To determine the device associated to the eMMC card have a look in the
/proc/partitions file:
cat /proc/partitions
Buildroot prepares a bootable "sdcard.img" image in the output/images/
directory, ready to be dumped on the eMMC card. Launch the following
command as root:
dd if=output/images/sdcard.img of=/dev/<your-sd-device>
*** WARNING! This will destroy all the eMMC content. Use with care! ***
For details about the medium image layout, see the definition in
board/freescale/common/imx/genimage.cfg.template.
Boot the i.MX7D Pico board
==========================
To boot your newly created system:
- put a micro USB cable into the Debug USB Port and connect using a terminal
emulator at 115200 bps, 8n1;
- power on the board.
Enjoy!

View File

@ -0,0 +1,14 @@
image sdcard.img {
hdimage {
}
partition unused {
size = 512B
}
partition rootfs {
partition-type = 0x83
image = "rootfs.ext4"
size = 256M
}
}

View File

@ -0,0 +1,51 @@
Technologic Systems TS-7680 SBC
===============================
This document explains how to set up a basic Buildroot system for
the Technologic Systems TS-7680 Single Board Computer.
The TS-7680 SBC is based on the Freescale i.MX286 ARM ARM926EJ-S
running at 454MHz. The TS-7680 features are 10/100 Ethernet ports,
Wi-Fi, microSD card, eMMC, NOR Flash, USB host port, CAN ports,
relays and ADC/DAC. More details on the board here:
https://wiki.embeddedarm.com/wiki/TS-7680
The TS-7680 uses a 3.14.28 Linux kernel provided by
Technologic Systems.
To build the default configuration you only have to run:
$ make ts7680_defconfig
$ make
The output looks like:
output/images
├── imx28-ts7680.dtb
├── rootfs.ext2
├── rootfs.ext4 -> rootfs.ext2
├── rootfs.tar
├── sdcard.img
└── uImage
The provided genimage configuration generates an image file containing
two partitions. The first one is unused, but mandatory as the
TS-7680 built-in bootloader loads the Linux uImage from the /boot
directory in the second partition. The second partition contains the
rootfs with the Linux uImage into the /boot directory.
$ fdisk output/images/sdcard.img
output/images/sdcard.img1 1 1 1 512B 0 Empty
output/images/sdcard.img2 2 524289 524288 256M 83 Linux
This image can be directly written to an SD card.
$ sudo dd if=output/images/sdcard.img of=/dev/mmcblk0
To boot with Buildroot, insert this SD card on the board, make sure
the SD jumper is present and the U-Boot jumper is not.
The bootloader comes pre-flashed on the board on an SPI flash. Since
updating the bootloader is risky and not trivial, it is not included
in the Buildroot defconfig. Refer to
https://wiki.embeddedarm.com/wiki/TS-7680#U-Boot for details on
which U-Boot config to use and how to flash it.

View File

@ -0,0 +1,75 @@
BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_NEON=y
BR2_ARM_ENABLE_VFP=y
BR2_ARM_FPU_VFPV3=y
# Linux headers same as kernel, a 4.11 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_11=y
# Additional features needed for packages
BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
# System
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc0"
# required tools to create the SD card image
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
# Filesystem
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
BR2_ROOTFS_OVERLAY="board/freescale/imx6q-sabresd/rootfs_overlay"
# Bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="mx6qsabresd"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.05"
BR2_TARGET_UBOOT_FORMAT_IMX=y
# Kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.11.6"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6q-sabresd"
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/freescale/imx6q-sabresd/linux_qt5.fragment"
# GL driver
BR2_PACKAGE_MESA3D=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV=y
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y
BR2_PACKAGE_MESA3D_OPENGL_ES=y
# Fonts
BR2_PACKAGE_BITSTREAM_VERA=y
BR2_PACKAGE_CANTARELL=y
BR2_PACKAGE_DEJAVU=y
BR2_PACKAGE_FONT_AWESOME=y
BR2_PACKAGE_GHOSTSCRIPT_FONTS=y
BR2_PACKAGE_INCONSOLATA=y
BR2_PACKAGE_LIBERATION=y
# GL demos
BR2_PACKAGE_GLMARK2=y
BR2_PACKAGE_KMSCUBE=y
BR2_PACKAGE_LIBV4L=y
BR2_PACKAGE_MESA3D_DEMOS=y
# Qt5
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5BASE_LICENSE_APPROVED=y
BR2_PACKAGE_QT5BASE_OPENGL_LIB=y
BR2_PACKAGE_QT5BASE_LINUXFB=y
BR2_PACKAGE_QT5BASE_FONTCONFIG=y
BR2_PACKAGE_QT5BASE_GIF=y
BR2_PACKAGE_QT5BASE_JPEG=y
BR2_PACKAGE_QT5CINEX=y
BR2_PACKAGE_QT5CINEX_HD=y

View File

@ -0,0 +1,36 @@
# architecture
BR2_arm=y
BR2_cortex_a7=y
BR2_ARM_FPU_NEON_VFPV4=y
# Linux headers same as kernel, a 4.12 series
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
# system
BR2_TARGET_GENERIC_GETTY_PORT="ttymxc4"
# kernel
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.12"
BR2_LINUX_KERNEL_PATCH="board/technexion/imx7dpico/patches/linux"
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx7d-pico"
# bootloader
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BOARDNAME="pico-imx7d"
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
BR2_TARGET_UBOOT_FORMAT_IMX=y
# required tools to create the eMMC image
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
# filesystem / image
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y

17
configs/ts7680_defconfig Normal file
View File

@ -0,0 +1,17 @@
BR2_arm=y
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_14=y
BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/technologic/ts7680/genimage.cfg"
BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_GIT=y
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/embeddedarm/linux-3.14.28-imx28.git"
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="ff01621df09b97d9fd546d1b49f4013060142892"
BR2_LINUX_KERNEL_DEFCONFIG="ts76xx"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x40008000"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx28-ts7680"
BR2_LINUX_KERNEL_INSTALL_TARGET=y
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_PACKAGE_HOST_GENIMAGE=y

View File

@ -6,6 +6,8 @@
ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs
ROOTFS_SQUASHFS_ARGS = -noappend -processors $(PARALLEL_JOBS)
ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y) ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZ4),y)
ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc ROOTFS_SQUASHFS_ARGS += -comp lz4 -Xhc
else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y) else ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4_LZO),y)
@ -19,8 +21,7 @@ ROOTFS_SQUASHFS_ARGS += -comp gzip
endif endif
define ROOTFS_SQUASHFS_CMD define ROOTFS_SQUASHFS_CMD
$(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ -noappend \ $(HOST_DIR)/bin/mksquashfs $(TARGET_DIR) $@ $(ROOTFS_SQUASHFS_ARGS)
$(ROOTFS_SQUASHFS_ARGS)
endef endef
$(eval $(call ROOTFS_TARGET,squashfs)) $(eval $(call ROOTFS_TARGET,squashfs))

View File

@ -504,6 +504,7 @@ endmenu
source "package/uccp420wlan/Config.in" source "package/uccp420wlan/Config.in"
source "package/udev/Config.in" source "package/udev/Config.in"
source "package/udisks/Config.in" source "package/udisks/Config.in"
source "package/uhubctl/Config.in"
source "package/upower/Config.in" source "package/upower/Config.in"
source "package/usb_modeswitch/Config.in" source "package/usb_modeswitch/Config.in"
source "package/usb_modeswitch_data/Config.in" source "package/usb_modeswitch_data/Config.in"
@ -693,6 +694,7 @@ menu "External python modules"
source "package/python-asn1crypto/Config.in" source "package/python-asn1crypto/Config.in"
source "package/python-attrs/Config.in" source "package/python-attrs/Config.in"
source "package/python-autobahn/Config.in" source "package/python-autobahn/Config.in"
source "package/python-automat/Config.in"
source "package/python-babel/Config.in" source "package/python-babel/Config.in"
source "package/python-backports-abc/Config.in" source "package/python-backports-abc/Config.in"
source "package/python-backports-shutil-get-terminal-size/Config.in" source "package/python-backports-shutil-get-terminal-size/Config.in"
@ -771,6 +773,7 @@ menu "External python modules"
source "package/python-lmdb/Config.in" source "package/python-lmdb/Config.in"
source "package/python-logbook/Config.in" source "package/python-logbook/Config.in"
source "package/python-lxml/Config.in" source "package/python-lxml/Config.in"
source "package/python-m2r/Config.in"
source "package/python-mad/Config.in" source "package/python-mad/Config.in"
source "package/python-mako/Config.in" source "package/python-mako/Config.in"
source "package/python-markdown/Config.in" source "package/python-markdown/Config.in"
@ -1283,6 +1286,7 @@ menu "Networking"
source "package/alljoyn-base/Config.in" source "package/alljoyn-base/Config.in"
source "package/alljoyn-tcl/Config.in" source "package/alljoyn-tcl/Config.in"
source "package/alljoyn-tcl-base/Config.in" source "package/alljoyn-tcl-base/Config.in"
source "package/azmq/Config.in"
source "package/azure-iot-sdk-c/Config.in" source "package/azure-iot-sdk-c/Config.in"
source "package/batman-adv/Config.in" source "package/batman-adv/Config.in"
source "package/c-ares/Config.in" source "package/c-ares/Config.in"
@ -1411,6 +1415,7 @@ menu "Other"
source "package/lapack/Config.in" source "package/lapack/Config.in"
source "package/libargtable2/Config.in" source "package/libargtable2/Config.in"
source "package/libatomic_ops/Config.in" source "package/libatomic_ops/Config.in"
source "package/libb64/Config.in"
source "package/libbsd/Config.in" source "package/libbsd/Config.in"
source "package/libcap/Config.in" source "package/libcap/Config.in"
source "package/libcap-ng/Config.in" source "package/libcap-ng/Config.in"
@ -1832,6 +1837,7 @@ comment "Utilities"
source "package/lockfile-progs/Config.in" source "package/lockfile-progs/Config.in"
source "package/logrotate/Config.in" source "package/logrotate/Config.in"
source "package/logsurfer/Config.in" source "package/logsurfer/Config.in"
source "package/pdmenu/Config.in"
source "package/pinentry/Config.in" source "package/pinentry/Config.in"
source "package/ranger/Config.in" source "package/ranger/Config.in"
source "package/screen/Config.in" source "package/screen/Config.in"

View File

@ -0,0 +1,43 @@
From d960f93fb52e373f76cfedbee5f4fb0c5276856a Mon Sep 17 00:00:00 2001
From: RJ Ascani <rj.ascani@gmail.com>
Date: Thu, 20 Jul 2017 15:53:40 -0700
Subject: [PATCH] Conditionally disable test and doc builds
Signed-off-by: RJ Ascani <rj.ascani@gmail.com>
---
CMakeLists.txt | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b5b9cc..97006a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,9 @@ include_directories(${Boost_INCLUDE_DIRS}
${ZeroMQ_INCLUDE_DIRS}
${PROJECT_SOURCE_DIR})
-enable_testing()
+if (BUILD_TESTING)
+ enable_testing()
+endif()
macro(add_catch_test name)
if (TEST_REPORT_FORMAT)
@@ -59,8 +61,12 @@ macro(add_catch_test name)
endif()
endmacro()
-add_subdirectory(test)
-add_subdirectory(doc)
+if (BUILD_TESTING)
+ add_subdirectory(test)
+endif()
+if (BUILD_DOC)
+ add_subdirectory(doc)
+endif()
install(DIRECTORY ${PROJECT_SOURCE_DIR}/azmq
DESTINATION include)
--
2.13.3

28
package/azmq/Config.in Normal file
View File

@ -0,0 +1,28 @@
config BR2_PACKAGE_AZMQ
bool "azmq"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_ATOMIC
depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
depends on BR2_USE_WCHAR # boost
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
select BR2_PACKAGE_ZEROMQ
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_BOOST_CHRONO
select BR2_PACKAGE_BOOST_DATE_TIME
select BR2_PACKAGE_BOOST_LOG
select BR2_PACKAGE_BOOST_RANDOM
select BR2_PACKAGE_BOOST_REGEX
select BR2_PACKAGE_BOOST_SYSTEM
select BR2_PACKAGE_BOOST_THREAD
help
This library provides Boost Asio style bindings for ZeroMQ.
https://github.com/zeromq/azmq
comment "azmq needs a toolchain w/ C++11, wchar and threads"
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
&& BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
comment "azmq needs exception_ptr"
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735

3
package/azmq/azmq.hash Normal file
View File

@ -0,0 +1,3 @@
# Locally calculated
# https://github.com/zeromq/azmq/archive/v1.0.tar.gz
sha256 c204c731bcb7810ca3a2c5515e88974ef2ff8d0589e60a897dc238b369180e7b azmq-v1.0.tar.gz

18
package/azmq/azmq.mk Normal file
View File

@ -0,0 +1,18 @@
################################################################################
#
# azmq
#
################################################################################
AZMQ_VERSION = v1.0
AZMQ_SITE = $(call github,zeromq,azmq,$(AZMQ_VERSION))
AZMQ_DEPENDENCIES = boost zeromq
AZMQ_LICENSE = BSL-1.0
AZMQ_LICENSE_FILES = LICENSE-BOOST_1_0
# AZMQ is a header only library, so it does not need to be installed on the
# target.
AZMQ_INSTALL_STAGING = YES
AZMQ_INSTALL_TARGET = NO
$(eval $(cmake-package))

View File

@ -14,6 +14,7 @@ BCUSDK_CONF_OPTS = \
--enable-onlyeibd \ --enable-onlyeibd \
--enable-ft12 \ --enable-ft12 \
--enable-pei16 \ --enable-pei16 \
--enable-tpuarts \
--enable-eibnetip \ --enable-eibnetip \
--enable-eibnetipserver \ --enable-eibnetipserver \
--enable-eibnetiptunnel \ --enable-eibnetiptunnel \

View File

@ -18,10 +18,10 @@ cross-compiling:
prevent overwriting those files/directories, which meant calling prevent overwriting those files/directories, which meant calling
"make install" twice was failing. "make install" twice was failing.
[Vincent: tweak the patch for 2.2.2 release] [Olivier: tweak the patch for 2.2.4 release]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
--- ---
Makedefs.in | 12 ++++++------ Makedefs.in | 12 ++++++------
conf/Makefile | 6 +++--- conf/Makefile | 6 +++---
@ -37,7 +37,7 @@ index 3afef0a..3e4f1bd 100644
# Installation programs... # Installation programs...
# #
-INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ -INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@
+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 +INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755
+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ +INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@
@ -45,9 +45,9 @@ index 3afef0a..3e4f1bd 100644
-INSTALL_DATA = $(INSTALL) -c -m 444 -INSTALL_DATA = $(INSTALL) -c -m 444
+INSTALL_DATA = $(INSTALL) -c -m 644 +INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_DIR = $(INSTALL) -d INSTALL_DIR = $(INSTALL) -d
-INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ -INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
-INSTALL_MAN = $(INSTALL) -c -m 444 -INSTALL_MAN = $(INSTALL) -c -m 444
-INSTALL_SCRIPT = $(INSTALL) -c -m 555 -INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 +INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755
+INSTALL_MAN = $(INSTALL) -c -m 644 +INSTALL_MAN = $(INSTALL) -c -m 644
+INSTALL_SCRIPT = $(INSTALL) -c -m 755 +INSTALL_SCRIPT = $(INSTALL) -c -m 755

View File

@ -7,7 +7,10 @@ Generating a statically linked binary built with PIE requires the
Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To
solve this, we simply disable the PIE flags. solve this, we simply disable the PIE flags.
[olivier tweak patch for 2.2.4]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
--- ---
Makedefs.in | 2 +- Makedefs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -16,13 +19,13 @@ diff --git a/Makedefs.in b/Makedefs.in
index 3afef0a..299b297 100644 index 3afef0a..299b297 100644
--- a/Makedefs.in --- a/Makedefs.in
+++ b/Makedefs.in +++ b/Makedefs.in
@@ -142,7 +142,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ @@ -148,7 +148,7 @@ IPPFIND_BIN = @IPPFIND_BIN@
IPPFIND_MAN = @IPPFIND_MAN@ IPPFIND_MAN = @IPPFIND_MAN@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \ -L../scheduler @LDARCHFLAGS@ \
- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) - @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM) + @LDFLAGS@ @RELROFLAGS@ $(OPTIM)
LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(SSLLIBS) $(LIBZ)
LINKCUPSIMAGE = @LINKCUPSIMAGE@ LINKCUPSIMAGE = @LINKCUPSIMAGE@
LIBS = $(LINKCUPS) $(COMMONLIBS) LIBS = $(LINKCUPS) $(COMMONLIBS)
-- --

View File

@ -1,39 +0,0 @@
From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
Date: Sun, 28 Feb 2016 16:35:56 +0100
Subject: [PATCH] Fix static linking with GnuTLS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
cups forgets to link against the libs found by pkg-config if it is build with
GnuTLS support.
Otherwise, static build fails with:
../cups/libcups.a(tls.o): In function `http_gnutls_create_credential':
cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init'
[..]
Status upstream: Pending
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---
Makedefs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makedefs.in b/Makedefs.in
index 299b297..ce9d535 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -143,7 +143,7 @@ IPPFIND_MAN = @IPPFIND_MAN@
LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \
-L../scheduler @LDARCHFLAGS@ \
@LDFLAGS@ @RELROFLAGS@ $(OPTIM)
-LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ)
LINKCUPSIMAGE = @LINKCUPSIMAGE@
LIBS = $(LINKCUPS) $(COMMONLIBS)
ONDEMANDFLAGS = @ONDEMANDFLAGS@
--
2.7.4

View File

@ -1,2 +1,2 @@
# Locally calculated: # Locally calculated:
sha256 66701fe15838f2c892052c913bde1ba106bbee2e0a953c955a62ecacce76885f cups-2.2.3-source.tar.gz sha256 596d4db72651c335469ae5f37b0da72ac9f97d73e30838d787065f559dea98cc cups-2.2.4-source.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
CUPS_VERSION = 2.2.3 CUPS_VERSION = 2.2.4
CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz
CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION)
CUPS_LICENSE = GPL-2.0, LGPL-2.0 CUPS_LICENSE = GPL-2.0, LGPL-2.0

View File

@ -1,2 +1,2 @@
# From https://download.enlightenment.org/rel/libs/efl/efl-1.19.1.tar.xz.sha256 # From https://download.enlightenment.org/rel/libs/efl/efl-1.20.2.tar.xz.sha256
sha256 8c69eaf5f3489245dff6112394bf3685fb9d6fd3915035fe022f27c554e6cd3a efl-1.19.1.tar.xz sha256 a540cb96f0a2a8f2e3001108d8432d2f21b45f6b12bd511eeebaadd5c934947e efl-1.20.2.tar.xz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
EFL_VERSION = 1.19.1 EFL_VERSION = 1.20.2
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
EFL_SITE = http://download.enlightenment.org/rel/libs/efl EFL_SITE = http://download.enlightenment.org/rel/libs/efl
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+ EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+

View File

@ -1,2 +1,2 @@
# From https://www.enlightenment.org/news/e0.21.8_release # From https://www.enlightenment.org/news/e0.21.9_release
sha256 fac21c5fb9cab89fb717b3577f7980fd0644ff1e94b144a55ba841116e8c5232 enlightenment-0.21.8.tar.xz sha256 eb560c0027378baf650d0690747ef0d08b5b329504e26e2210cc7978c019ae70 enlightenment-0.21.9.tar.xz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
ENLIGHTENMENT_VERSION = 0.21.8 ENLIGHTENMENT_VERSION = 0.21.9
ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz
ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment
ENLIGHTENMENT_LICENSE = BSD-2-Clause ENLIGHTENMENT_LICENSE = BSD-2-Clause

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 7d1054c475c82c626de3ad57201a7fc51da38667c8a7502149eb751edc6b601d erlang-jiffy-0.14.8.tar.gz sha256 c555726f592b79894c253ca1dc3c3aec6a5697271d29364d57f8175f387b86f3 erlang-jiffy-0.14.11.tar.gz

View File

@ -4,17 +4,11 @@
# #
################################################################################ ################################################################################
ERLANG_JIFFY_VERSION = 0.14.8 ERLANG_JIFFY_VERSION = 0.14.11
ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION)) ERLANG_JIFFY_SITE = $(call github,davisp,jiffy,$(ERLANG_JIFFY_VERSION))
ERLANG_JIFFY_LICENSE = MIT (core), \ ERLANG_JIFFY_LICENSE = MIT (core), \
BSD-3-Clause (Google double conversion library), \ BSD-3-Clause (Google double conversion library), \
BSD-3-Clause (tests) BSD-3-Clause (tests)
ERLANG_JIFFY_LICENSE_FILES = LICENSE ERLANG_JIFFY_LICENSE_FILES = LICENSE
# Set version manually in jiffy.app.src otherwise "git describe" is used.
define ERLANG_JIFFY_SET_VERSION_HOOK
$(SED) 's/{vsn, git}/{vsn, "$(ERLANG_JIFFY_VERSION)"}/' $(@D)/src/jiffy.app.src
endef
ERLANG_JIFFY_POST_PATCH_HOOKS = ERLANG_JIFFY_SET_VERSION_HOOK
$(eval $(rebar-package)) $(eval $(rebar-package))

View File

@ -1,5 +1,5 @@
# From https://sourceforge.net/projects/expat/files/expat/2.2.2/ # From https://sourceforge.net/projects/expat/files/expat/2.2.3/
md5 1ede9a41223c78528b8c5d23e69a2667 expat-2.2.2.tar.bz2 md5 f053af63ef5f39bd9b78d01fbc203334 expat-2.2.3.tar.bz2
sha1 891cee988b38d5d66953f62f94c3150b8810a70a expat-2.2.2.tar.bz2 sha1 e2be3a2aa8d12ce70184aab418d0d5d96ed86d0e expat-2.2.3.tar.bz2
# Calculated based on the hashes above # Calculated based on the hashes above
sha256 4376911fcf81a23ebd821bbabc26fd933f3ac74833f74924342c29aad2c86046 expat-2.2.2.tar.bz2 sha256 b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f expat-2.2.3.tar.bz2

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
EXPAT_VERSION = 2.2.2 EXPAT_VERSION = 2.2.3
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2
EXPAT_INSTALL_STAGING = YES EXPAT_INSTALL_STAGING = YES
@ -15,14 +15,5 @@ HOST_EXPAT_DEPENDENCIES = host-pkgconf
EXPAT_LICENSE = MIT EXPAT_LICENSE = MIT
EXPAT_LICENSE_FILES = COPYING EXPAT_LICENSE_FILES = COPYING
# Kernel versions older than 3.17 do not support getrandom()
ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17),)
EXPAT_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DXML_POOR_ENTROPY"
endif
# Make build succeed on host kernel older than 3.17. getrandom() will still
# be used on newer kernels.
HOST_EXPAT_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -DXML_POOR_ENTROPY"
$(eval $(autotools-package)) $(eval $(autotools-package))
$(eval $(host-autotools-package)) $(eval $(host-autotools-package))

View File

@ -1,50 +0,0 @@
From 1ab5258f7c2abfafcd63a760ca08bf93591912da Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 14 Dec 2016 16:11:05 -0800
Subject: [PATCH] Avoid conflicts with integer width macros from TS
18661-1:2014
glibc 2.25+ has now defined these macros in <limits.h>
https://sourceware.org/git/?p=glibc.git;a=commit;h=5b17fd0da62bf923cb61d1bb7b08cf2e1f1f9c1a
Create an alias for FC_CHAR_WIDTH for ABI compatibility
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
Patch status: upstream
fontconfig/fontconfig.h | 3 ++-
src/fcobjs.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 5c72b22..070a557 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -128,7 +128,8 @@ typedef int FcBool;
#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
/* Adjust outline rasterizer */
-#define FC_CHAR_WIDTH "charwidth" /* Int */
+#define FC_CHARWIDTH "charwidth" /* Int */
+#define FC_CHAR_WIDTH FC_CHARWIDTH
#define FC_CHAR_HEIGHT "charheight"/* Int */
#define FC_MATRIX "matrix" /* FcMatrix */
diff --git a/src/fcobjs.h b/src/fcobjs.h
index 1fc4f65..d27864b 100644
--- a/src/fcobjs.h
+++ b/src/fcobjs.h
@@ -51,7 +51,7 @@ FC_OBJECT (DPI, FcTypeDouble, NULL)
FC_OBJECT (RGBA, FcTypeInteger, NULL)
FC_OBJECT (SCALE, FcTypeDouble, NULL)
FC_OBJECT (MINSPACE, FcTypeBool, NULL)
-FC_OBJECT (CHAR_WIDTH, FcTypeInteger, NULL)
+FC_OBJECT (CHARWIDTH, FcTypeInteger, NULL)
FC_OBJECT (CHAR_HEIGHT, FcTypeInteger, NULL)
FC_OBJECT (MATRIX, FcTypeMatrix, NULL)
FC_OBJECT (CHARSET, FcTypeCharSet, FcCompareCharSet)
--
2.10.2

View File

@ -1,2 +1,2 @@
# From https://lists.freedesktop.org/archives/fontconfig/2016-August/005794.html # From https://lists.freedesktop.org/archives/fontconfig/2017-July/005961.html
sha256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 fontconfig-2.12.1.tar.bz2 sha256 668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c fontconfig-2.12.4.tar.bz2

View File

@ -4,16 +4,12 @@
# #
################################################################################ ################################################################################
FONTCONFIG_VERSION = 2.12.1 FONTCONFIG_VERSION = 2.12.4
FONTCONFIG_SITE = http://fontconfig.org/release FONTCONFIG_SITE = http://fontconfig.org/release
FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2
FONTCONFIG_INSTALL_STAGING = YES FONTCONFIG_INSTALL_STAGING = YES
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf
# When HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf
# 0001-Avoid-conflicts-with-integer-width-macros-from-TS-1866.patch is
# removed, the host-gperf dependency should be removed.
FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf host-gperf
HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf host-gperf
FONTCONFIG_LICENSE = fontconfig license FONTCONFIG_LICENSE = fontconfig license
FONTCONFIG_LICENSE_FILES = COPYING FONTCONFIG_LICENSE_FILES = COPYING

View File

@ -1,2 +1,2 @@
# locally computed # locally computed
sha256 40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz sha256 5232292cb1ad853905357de59ed251b57060562dc8d7f1cce0bb6c0c8d280dae imx-usb-loader-f04f225ebc1c38e81eb24745333c8622deda6b49.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c IMX_USB_LOADER_VERSION = f04f225ebc1c38e81eb24745333c8622deda6b49
IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION))
IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE = LGPL-2.1+
IMX_USB_LOADER_LICENSE_FILES = COPYING IMX_USB_LOADER_LICENSE_FILES = COPYING

View File

@ -8,6 +8,7 @@ JQ_VERSION = 1.5
JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION) JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION)
JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation)
JQ_LICENSE_FILES = COPYING JQ_LICENSE_FILES = COPYING
JQ_INSTALL_STAGING = YES
# uses c99 specific features # uses c99 specific features
JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99"

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 cb0fa6f8326b439006701890d3fd90621b4f6f2db6055a9abe781b089170d28f kodi-inputstream-adaptive-1.0.8_k17.tar.gz sha256 4691ac8bde78b5abb2847cf6ad64d36141c0582f944ba435eafe7702cc2d1187 kodi-inputstream-adaptive-161f319bb2cd946f4659d841a54f19b1fb6143cc.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
KODI_INPUTSTREAM_ADAPTIVE_VERSION = 1.0.8_k17 KODI_INPUTSTREAM_ADAPTIVE_VERSION = 161f319bb2cd946f4659d841a54f19b1fb6143cc
KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION)) KODI_INPUTSTREAM_ADAPTIVE_SITE = $(call github,peak3d,inputstream.adaptive,$(KODI_INPUTSTREAM_ADAPTIVE_VERSION))
KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+ KODI_INPUTSTREAM_ADAPTIVE_LICENSE = GPL-2.0+
KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp KODI_INPUTSTREAM_ADAPTIVE_LICENSE_FILES = src/main.cpp

View File

@ -6,7 +6,7 @@
# Not possible to directly refer to kodi variables, because of # Not possible to directly refer to kodi variables, because of
# first/second expansion trickery... # first/second expansion trickery...
KODI_JSONSCHEMABUILDER_VERSION = 17.3-Krypton KODI_JSONSCHEMABUILDER_VERSION = 17.4-Krypton
KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION)) KODI_JSONSCHEMABUILDER_SITE = $(call github,xbmc,xbmc,$(KODI_JSONSCHEMABUILDER_VERSION))
KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz KODI_JSONSCHEMABUILDER_SOURCE = kodi-$(KODI_JSONSCHEMABUILDER_VERSION).tar.gz
KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0 KODI_JSONSCHEMABUILDER_LICENSE = GPL-2.0

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 29867bd1fad4c4d69ec0d25ea1bb1507fd4543442aef890a2124f63f67318d92 kodi-pvr-hts-3.4.24-Krypton.tar.gz sha256 4fb24496622762ea8c894368bdababd2104c5f70978b901b983974ef389b83e1 kodi-pvr-hts-3.4.27.tar.gz

View File

@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton' # This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch # When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_HTS_VERSION = 3.4.24-Krypton KODI_PVR_HTS_VERSION = 3.4.27
KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION))
KODI_PVR_HTS_LICENSE = GPL-2.0+ KODI_PVR_HTS_LICENSE = GPL-2.0+
KODI_PVR_HTS_LICENSE_FILES = src/client.h KODI_PVR_HTS_LICENSE_FILES = src/client.h

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 0a006e275cddba02d5d3fd22a95cec6411a765719509a9bc8fcc93dfa247bd4c kodi-pvr-iptvsimple-2.4.11-Krypton.tar.gz sha256 329bd71e5c786d7b037bf5fd103ee4abff892afc6e5186a5d0a797194a8c4c7c kodi-pvr-iptvsimple-2.4.14-Krypton.tar.gz

View File

@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton' # This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch # When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_IPTVSIMPLE_VERSION = 2.4.11-Krypton KODI_PVR_IPTVSIMPLE_VERSION = 2.4.14-Krypton
KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION))
KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+ KODI_PVR_IPTVSIMPLE_LICENSE = GPL-2.0+
KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 30b6a20f846f0f0cc14c2347efbf3b72162c876daed53a3731d3f975d370765e kodi-pvr-mythtv-4.15.0.tar.gz sha256 fd60aba0dac25ab5885371495a5dfca53308c1fa23215299b0f62997c7391e1e kodi-pvr-mythtv-4.15.3.tar.gz

View File

@ -6,7 +6,7 @@
# This cset is on the branch 'Krypton' # This cset is on the branch 'Krypton'
# When Kodi is updated, then this should be updated to the corresponding branch # When Kodi is updated, then this should be updated to the corresponding branch
KODI_PVR_MYTHTV_VERSION = 4.15.0 KODI_PVR_MYTHTV_VERSION = 4.15.3
KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) KODI_PVR_MYTHTV_SITE = $(call github,janbar,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION))
KODI_PVR_MYTHTV_LICENSE = GPL-2.0+ KODI_PVR_MYTHTV_LICENSE = GPL-2.0+
KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h

View File

@ -6,7 +6,7 @@
# Not possible to directly refer to kodi variables, because of # Not possible to directly refer to kodi variables, because of
# first/second expansion trickery... # first/second expansion trickery...
KODI_TEXTUREPACKER_VERSION = 17.3-Krypton KODI_TEXTUREPACKER_VERSION = 17.4-Krypton
KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION)) KODI_TEXTUREPACKER_SITE = $(call github,xbmc,xbmc,$(KODI_TEXTUREPACKER_VERSION))
KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz KODI_TEXTUREPACKER_SOURCE = kodi-$(KODI_TEXTUREPACKER_VERSION).tar.gz
KODI_TEXTUREPACKER_LICENSE = GPL-2.0 KODI_TEXTUREPACKER_LICENSE = GPL-2.0

View File

@ -1,91 +0,0 @@
From 5fa10ff6b1b60abee172296d9c1dec8dfc10615c Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 7 May 2017 17:30:47 +0300
Subject: [PATCH] FTPParse.cpp: use std::string
Fixes build with newer gcc versions.
Backported from upstream commit
https://github.com/xbmc/xbmc/commit/5fa10ff6b1b60abee172296d9c1dec8dfc10615c
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
index cfcc7c64ed..b0f676ae1a 100644
--- a/xbmc/filesystem/FTPParse.cpp
+++ b/xbmc/filesystem/FTPParse.cpp
@@ -34,7 +34,7 @@ CFTPParse::CFTPParse()
m_time = 0;
}
-string CFTPParse::getName()
+std::string CFTPParse::getName()
{
return m_name;
}
@@ -59,16 +59,16 @@ time_t CFTPParse::getTime()
return m_time;
}
-void CFTPParse::setTime(string str)
+void CFTPParse::setTime(std::string str)
{
/* Variables used to capture patterns via the regexes */
- string month;
- string day;
- string year;
- string hour;
- string minute;
- string second;
- string am_or_pm;
+ std::string month;
+ std::string day;
+ std::string year;
+ std::string hour;
+ std::string minute;
+ std::string second;
+ std::string am_or_pm;
/* time struct used to set the time_t variable */
struct tm time_struct = {};
@@ -338,21 +338,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
return day_of_week;
}
-int CFTPParse::FTPParse(string str)
+int CFTPParse::FTPParse(std::string str)
{
/* Various variable to capture patterns via the regexes */
- string permissions;
- string link_count;
- string owner;
- string group;
- string size;
- string date;
- string name;
- string type;
- string stuff;
- string facts;
- string version;
- string file_id;
+ std::string permissions;
+ std::string link_count;
+ std::string owner;
+ std::string group;
+ std::string size;
+ std::string date;
+ std::string name;
+ std::string type;
+ std::string stuff;
+ std::string facts;
+ std::string version;
+ std::string file_id;
/* Regex for standard Unix listing formats */
pcrecpp::RE unix_re("^([-bcdlps])" // type
--
2.11.0

View File

@ -1,5 +1,5 @@
# Locally computed # Locally computed
sha256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 kodi-17.3-Krypton.tar.gz sha256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f kodi-17.4-Krypton.tar.gz
# Locally computed - libdvdcss # Locally computed - libdvdcss
sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz sha256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 2f12236.tar.gz
# Locally computed - libdvdnav # Locally computed - libdvdnav

View File

@ -6,7 +6,7 @@
# When updating the version, please also update kodi-jsonschemabuilder # When updating the version, please also update kodi-jsonschemabuilder
# and kodi-texturepacker # and kodi-texturepacker
KODI_VERSION = 17.3-Krypton KODI_VERSION = 17.4-Krypton
KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION))
KODI_LICENSE = GPL-2.0 KODI_LICENSE = GPL-2.0
KODI_LICENSE_FILES = LICENSE.GPL KODI_LICENSE_FILES = LICENSE.GPL
@ -67,6 +67,7 @@ KODI_CONF_OPTS += \
-DENABLE_OPENSSL=ON \ -DENABLE_OPENSSL=ON \
-DNATIVEPREFIX=$(HOST_DIR) \ -DNATIVEPREFIX=$(HOST_DIR) \
-DDEPENDS_PATH=$(@D) \ -DDEPENDS_PATH=$(@D) \
-DWITH_FFMPEG=$(STAGING_DIR)/usr \
-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \ -DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
-DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \ -DLIBDVDCSS_URL=$(DL_DIR)/$(KODI_LIBDVDCSS_VERSION).tar.gz \
-DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \ -DLIBDVDNAV_URL=$(DL_DIR)/$(KODI_LIBDVDNAV_VERSION).tar.gz \

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662 libatomic_ops-libatomic_ops-7_4_4.tar.gz sha256 cf7e61f7f929651b65d6186a03446819805c867f4f75c7148c8f26321eb66260 libatomic_ops-v7.4.6.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_4 LIBATOMIC_OPS_VERSION = v7.4.6
LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION)) LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION))
LIBATOMIC_OPS_AUTORECONF = YES LIBATOMIC_OPS_AUTORECONF = YES

14
package/libb64/Config.in Normal file
View File

@ -0,0 +1,14 @@
config BR2_PACKAGE_LIBB64
bool "libb64"
help
libb64 is a library of ANSI C routines for fast encoding
and decoding of data into and from a base64-encoded format.
C++ wrappers are included, as well as the source code for
standalone encoding and decoding executables.
Base64 uses a subset of displayable ASCII characters, and is
therefore a useful encoding for storing binary data in a text
file, such as XML, or sending binary data over text-only
email.
http://libb64.sourceforge.net

View File

@ -0,0 +1,3 @@
# sha1 from sourceforge, sha256 locally computed
sha1 04b3e21b8c951d27f02fe91249ca3474554af0b9 libb64-1.2.1.zip
sha256 20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2 libb64-1.2.1.zip

30
package/libb64/libb64.mk Normal file
View File

@ -0,0 +1,30 @@
################################################################################
#
# libb64
#
################################################################################
LIBB64_VERSION = 1.2.1
LIBB64_SOURCE = libb64-$(LIBB64_VERSION).zip
LIBB64_SITE = https://downloads.sourceforge.net/project/libb64/libb64/libb64
LIBB64_LICENSE = Public Domain
LIBB64_LICENSE_FILES = LICENSE
LIBB64_INSTALL_STAGING = YES
# Only static lib and headers
LIBB64_INSTALL_TARGET = NO
define LIBB64_EXTRACT_CMDS
unzip $(DL_DIR)/$(LIBB64_SOURCE) -d $(BUILD_DIR)
endef
define LIBB64_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)" -C $(@D) all_src
endef
define LIBB64_INSTALL_STAGING_CMDS
$(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/b64
$(INSTALL) -m 0644 $(@D)/include/b64/* $(STAGING_DIR)/usr/include/b64
$(INSTALL) -D -m 0755 $(@D)/src/libb64.a $(STAGING_DIR)/usr/lib
endef
$(eval $(generic-package))

View File

@ -1,122 +0,0 @@
Index: b/src/cgi.c
===================================================================
--- a/src/cgi.c
+++ b/src/cgi.c
@@ -336,7 +336,7 @@
hextable['b'] = 11;
hextable['c'] = 12;
hextable['d'] = 13;
- hextable['e'] = 13;
+ hextable['e'] = 14;
hextable['f'] = 15;
hextable['A'] = 10;
hextable['B'] = 11;
Index: b/src/string.c
===================================================================
--- a/src/string.c
+++ b/src/string.c
@@ -584,7 +584,7 @@
va_start(ptr, s);
- va_copy(bkp, str);
+ va_copy(bkp, ptr);
len = strlen(s);
while (*str) {
Index: b/Makefile.in
===================================================================
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,22 +5,32 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-SHAREDOPT = -shared
+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0
LIBDIR = $(prefix)/lib
-INCDIR = $(prefix)/include
+INCDIR = $(prefix)/include/libcgi/
MANDIR = $(prefix)/man/man3
SHELL = /bin/sh
EXTRA_LIBS =
INCS = -Isrc
-FLAGS = -Wall -fpic
+FLAGS = -Wall -D_REENTRANT
OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \
src/string.o src/general.o src/list.o src/cookie.o
+SHOBJS=$(OBJS:.o=.sh.o)
-.c.o: $(CC) $(FLAGS) -c $<
+ALL_TARGETS = src/libcgi.a
+ifeq ($(STATIC),)
+ALL_TARGETS += src/libcgi.so
+endif
-all: $(OBJS) src/libcgi.so
+%.o: %.c
+ $(CC) $(FLAGS) -c $*.c -o $@
+
+%.sh.o: %.c
+ $(CC) $(FLAGS) -fPIC -c $*.c -o $@
+
+all: $(ALL_TARGETS)
@echo ""
@echo ""
@@ -48,14 +58,17 @@
src/libcgi.a: $(OBJS)
$(AR) rc src/libcgi.a $(OBJS)
-src/libcgi.so: src/libcgi.a
- $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS)
+src/libcgi.so: $(SHOBJS)
+ $(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS)
install:
- cp src/libcgi.a $(LIBDIR)
- cp src/libcgi.so $(LIBDIR)
- cp src/cgi.h $(INCDIR)
- cp src/session.h $(INCDIR)
+ cp src/libcgi.a $(DESTDIR)/$(LIBDIR)
+ifeq ($(STATIC),)
+ cp src/libcgi.so $(DESTDIR)/$(LIBDIR)
+endif
+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR)
+ cp src/cgi.h $(DESTDIR)/$(INCDIR)
+ cp src/session.h $(DESTDIR)/$(INCDIR)
src/error.o: src/error.c src/error.h
@@ -69,8 +82,9 @@
src/list.o: src/list.c
clean:
- find src/ -name *.*o -exec rm -f {} \;
+ find src/ -name *.o -exec rm -f {} \;
find src/ -name *.a -exec rm -f {} \;
+ find src/ -name *.so -exec rm -f {} \;
uninstall: clean
rm -f $(LIBDIR)/libcgi.*
@@ -78,11 +92,11 @@
rm -f $(INCDIR)/session.h
rm -f $(MANDIR)/libcgi*
-install_man:
- cp doc/man/man3/libcgi_base64.3 $(MANDIR)
- cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
- cp doc/man/man3/libcgi_general.3 $(MANDIR)
- cp doc/man/man3/libcgi_string.3 $(MANDIR)
- cp doc/man/man3/libcgi_session.3 $(MANDIR)
- cp doc/man/man3/libcgi_cookie.3 $(MANDIR)
+#install_man:
+# cp doc/man/man3/libcgi_base64.3 $(MANDIR)
+# cp doc/man/man3/libcgi_cgi.3 $(MANDIR)
+# cp doc/man/man3/libcgi_general.3 $(MANDIR)
+# cp doc/man/man3/libcgi_string.3 $(MANDIR)
+# cp doc/man/man3/libcgi_session.3 $(MANDIR)
+# cp doc/man/man3/libcgi_cookie.3 $(MANDIR)

View File

@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCGI
session and cookie support, GET and POST methods manipulation session and cookie support, GET and POST methods manipulation
etc..., to help you to quickly write powerful CGI programs. etc..., to help you to quickly write powerful CGI programs.
http://libcgi.sourceforge.net/ https://github.com/rafaelsteil/libcgi/

View File

@ -1,2 +1,2 @@
# Locally computed: # From https://github.com/rafaelsteil/libcgi/releases/download/v1.1/libcgi-1.1.tar.gz.sha256sum
sha256 861df39cc0195d43419c4c3de8dff4f42478db66c9ba0b0c1e994c99400e130c libcgi-1.0.tar.gz sha256 128445f2f828e84905d51bd53d11e2e08c489df3a07225ff9f198c1318092fe6 libcgi-1.1.tar.gz

View File

@ -4,12 +4,10 @@
# #
################################################################################ ################################################################################
LIBCGI_VERSION = 1.0 LIBCGI_VERSION = 1.1
LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION) LIBCGI_SITE = https://github.com/rafaelsteil/libcgi/releases/download/v$(LIBCGI_VERSION)
LIBCGI_INSTALL_STAGING = YES LIBCGI_INSTALL_STAGING = YES
# use cross CC/AR rather than host
LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \
$(if $(BR2_STATIC_LIBS),STATIC=1)
LIBCGI_LICENSE = LGPL-2.1+ LIBCGI_LICENSE = LGPL-2.1+
$(eval $(autotools-package)) $(eval $(cmake-package))

View File

@ -1,5 +1,5 @@
# From https://lists.freedesktop.org/archives/dri-devel/2017-July/147750.html # From https://lists.freedesktop.org/archives/dri-devel/2017-August/151077.html
md5 29867814123c3d23056b1d05aada1b9d libdrm-2.4.82.tar.bz2 md5 23800953ed7564988872e1e8c61fde31 libdrm-2.4.83.tar.bz2
sha1 c42ff308db6352eaf009a8209c7aaadbc951a89f libdrm-2.4.82.tar.bz2 sha1 f78d392684d6e482e8c0a85d355619ac64c4ad6a libdrm-2.4.83.tar.bz2
sha256 43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c libdrm-2.4.82.tar.bz2 sha256 03a52669da60ead62548a35bc430aafb6c2d8dd21ec9dba3a90f96eff5fe36d6 libdrm-2.4.83.tar.bz2
sha512 e69fd8c2b392daabbb3a548179e3a21a555d5174c11d76a288eb2a08850849aa867c7777b67798ec00e026e998a3b128c22698f05a7b44eb24cddc5c8a3a02d0 libdrm-2.4.82.tar.bz2 sha512 8f894ff61939bca03ac857506a84bbbcbe2367e60c91a0f2388bfce5ae81e12ba2f96fe1c962416cf9e2d25ef04b98b5437c7015497789561311a72607b3bfcb libdrm-2.4.83.tar.bz2

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBDRM_VERSION = 2.4.82 LIBDRM_VERSION = 2.4.83
LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2
LIBDRM_SITE = http://dri.freedesktop.org/libdrm LIBDRM_SITE = http://dri.freedesktop.org/libdrm
LIBDRM_LICENSE = MIT LIBDRM_LICENSE = MIT

View File

@ -1,200 +0,0 @@
From 0511fc56e7017209ad18d16551ccaad05de9486c Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Mon, 8 May 2017 23:12:49 +0200
Subject: [PATCH] Make EGL support optional
It is perfectly possible to build Mesa3D with just OpenGL support, and
use with GLX in X.org, without having EGL/OpenGLES support.
However, libepoxy currently unconditionally requires EGL support in its
configure.ac, which causes a build failure when Mesa3D only provides
full OpenGL support:
checking for EGL... no
configure: error: Package requirements (egl) were not met:
Package egl was not found in the pkg-config search path.
Perhaps you should add the directory containing `egl.pc'
to the PKG_CONFIG_PATH environment variable
Package 'egl', required by 'world', not found
This commit fixes that by:
- Adjusting the configure.ac to add a --{enable,disable}-egl option
handled in the exact same way as --{enable,disable}-glx
- Adjusting the meson build logic in the same way.
- Adjusting src/dispatch_common.h to define PLATFORM_HAS_EGL correctly,
which allows to not include any EGL related header file if EGL
support is not enabled.
Submitted-upstream: https://github.com/anholt/libepoxy/pull/123
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configure.ac | 33 ++++++++++++++++++++++++++++-----
meson.build | 21 ++++++++++++++++++---
meson_options.txt | 5 +++++
src/dispatch_common.h | 8 ++++----
4 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/configure.ac b/configure.ac
index 31b0985..2dbecd9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,11 +88,35 @@ AS_CASE([$enable_glx],
[AC_MSG_ERROR([Invalid value "$enable_glx" for option "--enable-glx"])]
])
-# The remaining platform specific API for GL/GLES are enabled
-# depending on the platform we're building for
+AC_ARG_ENABLE([egl],
+ [AC_HELP_STRING([--enable-egl=@<:@auto,yes,no@:>@], [Enable EGL support @<:@default=auto@:>@])],
+ [enable_egl=$enableval],
+ [enable_egl=auto])
+
+AS_CASE([$enable_egl],
+ [auto], [
+ AS_CASE([$host_os],
+ [mingw*], [build_egl=no],
+ [darwin*], [build_egl=no],
+ [android*], [build_egl=no],
+ [build_egl=yes])
+ ],
+
+ [yes], [
+ build_egl=yes
+ ],
+
+ [no], [
+ build_egl=no
+ ],
+
+ [AC_MSG_ERROR([Invalid value "$enable_egl" for option "--enable-egl"])]
+])
+
+# The remaining platform specific API are enabled depending on the
+# platform we're building for
AS_CASE([$host_os],
[mingw*], [
- build_egl=no
build_wgl=yes
has_znow=yes
# On windows, the DLL has to have all of its functions
@@ -108,7 +132,6 @@ AS_CASE([$host_os],
],
[darwin*], [
- build_egl=no
build_wgl=no
build_apple=yes
has_znow=no
@@ -116,7 +139,6 @@ AS_CASE([$host_os],
],
[
- build_egl=yes
build_wgl=no
has_znow=yes
# On platforms with dlopen, we load everything dynamically and
@@ -131,6 +153,7 @@ AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes)
if test x$build_egl = xyes; then
PKG_CHECK_MODULES(EGL, [egl])
AC_DEFINE([BUILD_EGL], [1], [build EGL tests])
+ AC_DEFINE(ENABLE_EGL, [1], [Whether EGL support is enabled])
fi
AM_CONDITIONAL(BUILD_GLX, test x$build_glx = xyes)
diff --git a/meson.build b/meson.build
index 5435f45..226152e 100644
--- a/meson.build
+++ b/meson.build
@@ -51,26 +51,41 @@ elif enable_glx == 'no'
build_glx = false
endif
+enable_egl = get_option('enable-egl')
+if enable_egl == 'auto'
+ if host_system == 'windows'
+ build_egl = false
+ elif host_system == 'darwin'
+ build_egl = false
+ elif host_system == 'android'
+ build_egl = false
+ else
+ build_egl = true
+ endif
+elif enable_egl == 'yes'
+ build_egl = true
+elif enable_egl == 'no'
+ build_egl = false
+endif
+
# The remaining platform specific API for GL/GLES are enabled
# depending on the platform we're building for
if host_system == 'windows'
- build_egl = false
build_apple = false
build_wgl = true
has_znow = true
elif host_system == 'darwin'
- build_egl = false
build_apple = true
build_wgl = false
has_znow = false
else
- build_egl = true
build_apple = false
build_wgl = false
has_znow = true
endif
conf.set10('ENABLE_GLX', build_glx)
+conf.set10('ENABLE_EGL', build_egl)
# Compiler flags, taken from the Xorg macros
if cc.get_id() == 'msvc'
diff --git a/meson_options.txt b/meson_options.txt
index 18932f5..244476a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,3 +6,8 @@ option('enable-glx',
choices: [ 'auto', 'yes', 'no' ],
value: 'auto',
description: 'Enable GLX support')
+option('enable-egl',
+ type: 'combo',
+ choices: [ 'auto', 'yes', 'no' ],
+ value: 'auto',
+ description: 'Enable EGL support')
diff --git a/src/dispatch_common.h b/src/dispatch_common.h
index e3277f7..e16771f 100644
--- a/src/dispatch_common.h
+++ b/src/dispatch_common.h
@@ -24,19 +24,19 @@
#include "config.h"
#ifdef _WIN32
-#define PLATFORM_HAS_EGL 0
+#define PLATFORM_HAS_EGL ENABLE_EGL
#define PLATFORM_HAS_GLX ENABLE_GLX
#define PLATFORM_HAS_WGL 1
#elif defined(__APPLE__)
-#define PLATFORM_HAS_EGL 0
+#define PLATFORM_HAS_EGL ENABLE_EGL
#define PLATFORM_HAS_GLX ENABLE_GLX
#define PLATFORM_HAS_WGL 0
#elif defined(ANDROID)
-#define PLATFORM_HAS_EGL 1
+#define PLATFORM_HAS_EGL ENABLE_EGL
#define PLATFORM_HAS_GLX 0
#define PLATFORM_HAS_WGL 0
#else
-#define PLATFORM_HAS_EGL 1
+#define PLATFORM_HAS_EGL ENABLE_EGL
#define PLATFORM_HAS_GLX ENABLE_GLX
#define PLATFORM_HAS_WGL 0
#endif
--
2.7.4

View File

@ -1,2 +1,2 @@
# From ftp://ftp.gnome.org/pub/gnome/sources/libepoxy/1.4/libepoxy-1.4.1.sha256sum # From ftp://ftp.gnome.org/pub/GNOME/sources/libepoxy/1.4/libepoxy-1.4.3.sha256sum
sha256 88c6abf5522fc29bab7d6c555fd51a855cbd9253c4315f8ea44e832baef21aa6 libepoxy-1.4.1.tar.xz sha256 0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6 libepoxy-1.4.3.tar.xz

View File

@ -5,15 +5,13 @@
################################################################################ ################################################################################
LIBEPOXY_VERSION_MAJOR = 1.4 LIBEPOXY_VERSION_MAJOR = 1.4
LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).1 LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).3
LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR)
LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz
LIBEPOXY_INSTALL_STAGING = YES LIBEPOXY_INSTALL_STAGING = YES
LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros
LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE = MIT
LIBEPOXY_LICENSE_FILES = COPYING LIBEPOXY_LICENSE_FILES = COPYING
# 0002-Make-EGL-support-optional.patch
LIBEPOXY_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y)
LIBEPOXY_CONF_OPTS += --enable-egl LIBEPOXY_CONF_OPTS += --enable-egl

View File

@ -1,2 +1,3 @@
# Locally computed (after checking the signature from http://www.intra2net.com/en/developer/libftdi/download.php) # Locally computed after checking the signature
sha256 9a8c95c94bfbcf36584a0a58a6e2003d9b133213d9202b76aec76302ffaa81f4 libftdi1-1.3.tar.bz2 # https://www.intra2net.com/en/developer/libftdi/download/libftdi1-1.4.tar.bz2.sig
sha256 ec36fb49080f834690c24008328a5ef42d3cf584ef4060f3a35aa4681cb31b74 libftdi1-1.4.tar.bz2

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBFTDI1_VERSION = 1.3 LIBFTDI1_VERSION = 1.4
LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2
LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download
LIBFTDI1_INSTALL_STAGING = YES LIBFTDI1_INSTALL_STAGING = YES

View File

@ -1,2 +1,2 @@
# Locally computed: # Locally computed:
sha256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 libhttpparser-v2.6.0.tar.gz sha256 70409ad324e5de2da6a0f39e859e566d497c1ff0a249c0c38a5012df91b386b3 libhttpparser-v2.7.1.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBHTTPPARSER_VERSION = v2.6.0 LIBHTTPPARSER_VERSION = v2.7.1
LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION))
LIBHTTPPARSER_INSTALL_STAGING = YES LIBHTTPPARSER_INSTALL_STAGING = YES
LIBHTTPPARSER_LICENSE = MIT LIBHTTPPARSER_LICENSE = MIT

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 993a7df9ee091fca430cdde3263df57d88ef62af8103903214da49fc51bbb56c ltm-1.0.tar.xz sha256 47032fb39d698ce4cf9c9c462c198e6b08790ce8203ad1224086b9b978636c69 ltm-1.0.1.tar.xz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBTOMMATH_VERSION = 1.0 LIBTOMMATH_VERSION = 1.0.1
LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION)
LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz
LIBTOMMATH_LICENSE = WTFPL LIBTOMMATH_LICENSE = WTFPL

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 41ce914a88da21d3b07a76023beca57576ca5b376c6ac440c80bc581cbca1250 libuv-v1.12.0.tar.gz sha256 6a4976887594ec9f4e8521c95598dbbc478c59733056a5cf46354e93a1bc8400 libuv-v1.13.1.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LIBUV_VERSION = v1.12.0 LIBUV_VERSION = v1.13.1
LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION))
LIBUV_DEPENDENCIES = host-pkgconf LIBUV_DEPENDENCIES = host-pkgconf
LIBUV_INSTALL_STAGING = YES LIBUV_INSTALL_STAGING = YES

View File

@ -329,4 +329,13 @@ config BR2_PACKAGE_LINUX_FIRMWARE_IMX_SDMA
endmenu endmenu
menu "Fibre Channel Adapter Firmware"
config BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX
bool "QLogic 2xxx Fibre Channel Adapters"
help
Firmware files for ql2xxx adapters
endmenu
endif endif

View File

@ -414,6 +414,14 @@ LINUX_FIRMWARE_FILES += \
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx
endif endif
# ql2xxx
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_QLOGIC_2XXX),y)
LINUX_FIRMWARE_FILES += \
ql2100_fw.bin ql2200_fw.bin ql2300_fw.bin ql2322_fw.bin \
ql2400_fw.bin ql2500_fw.bin
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.qla2xxx
endif
ifneq ($(LINUX_FIRMWARE_FILES),) ifneq ($(LINUX_FIRMWARE_FILES),)
define LINUX_FIRMWARE_INSTALL_FILES define LINUX_FIRMWARE_INSTALL_FILES
cd $(@D) ; \ cd $(@D) ; \

View File

@ -1,34 +0,0 @@
From 17562259fb6684f351a70b98b4f3b438927ba1aa Mon Sep 17 00:00:00 2001
From: Peter Seiderer <ps.report@gmx.net>
Date: Mon, 11 Jul 2016 22:58:31 +0200
Subject: [PATCH] Fix musl compile.
Include proper config.h (via log4cpp/Portability.hh) to fix the
evaluate of LOG4CPP_HAVE_STDINT_H in the file tests/Clock.hh
Fixes:
Clock.hh:17:13: error: 'int64_t' does not name a type
typedef int64_t usec_t;
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
log4cpp/tests/Clock.hh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/log4cpp/tests/Clock.hh b/log4cpp/tests/Clock.hh
index 4bf0ca4..45c6467 100644
--- a/log4cpp/tests/Clock.hh
+++ b/log4cpp/tests/Clock.hh
@@ -6,6 +6,8 @@
#ifndef __CLOCK_H
#define __CLOCK_H
+#include <log4cpp/Portability.hh>
+
#ifdef LOG4CPP_HAVE_STDINT_H
#include <stdint.h>
#endif // LOG4CPP_HAVE_STDINT_H
--
2.8.1

View File

@ -1,3 +1,5 @@
# From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/ # From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/
md5 1e173df8ee97205f412ff84aa93b8fbe log4cpp-1.1.1.tar.gz md5 b9e2cee932da987212f2c74b767b4d8b log4cpp-1.1.3.tar.gz
sha1 23aa5bd7d6f79992c92bad3e1c6d64a34f8fcf68 log4cpp-1.1.1.tar.gz sha1 74f0fea7931dc1bc4e5cd34a6318cd2a51322041 log4cpp-1.1.3.tar.gz
# Locally computed
sha256 2cbbea55a5d6895c9f0116a9a9ce3afb86df383cd05c9d6c1a4238e5e5c8f51d log4cpp-1.1.3.tar.gz

View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
LOG4CPP_VERSION_MAJOR = 1.1 LOG4CPP_VERSION_MAJOR = 1.1
LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).1 LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).3
LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR) LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR)
LOG4CPP_SUBDIR = log4cpp LOG4CPP_SUBDIR = log4cpp
# The "or later" is indicated in the HTML documentation # The "or later" is indicated in the HTML documentation

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 62aa0229cfd34c7b6ea6a6736d569983bf4a3dd1f3c9e9c2efe2ffe2a0a55cf2 logrotate-3.11.0.tar.gz sha256 683ccb7fff74082471aa6bd9e962ae7a3f4d55eea7df41fd97aa12ec6f55e657 logrotate-3.12.3.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LOGROTATE_VERSION = 3.11.0 LOGROTATE_VERSION = 3.12.3
LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION))
LOGROTATE_LICENSE = GPL-2.0+ LOGROTATE_LICENSE = GPL-2.0+
LOGROTATE_LICENSE_FILES = COPYING LOGROTATE_LICENSE_FILES = COPYING

View File

@ -1,2 +1,3 @@
# Locally computed: # From https://www.crypt.gen.nz/logsurfer/
sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz md5 4c26a74d813ccf766117c95c644aa601 logsurfer-1.8.tar.gz
sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 2eab80360f8ab6793612bb59d067a56664ac9a5a14988e0a09a53d0bff20c131 luv-1.9.1-0.tar.gz sha256 1051cfbdc361d5ea6d978fd71273b94c8a5007d76af498b456b297b18de9622c luv-1.9.1-1.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LUV_VERSION = 1.9.1-0 LUV_VERSION = 1.9.1-1
LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION)
LUV_LICENSE = Apache-2.0 LUV_LICENSE = Apache-2.0
LUV_LICENSE_FILES = LICENSE.txt LUV_LICENSE_FILES = LICENSE.txt

View File

@ -1,2 +1,2 @@
# Locally calculated # Locally calculated
sha256 b36a3b96ec5852398338bc38567c5bb589783487c65130e1d702ff98fac3a6b7 luvi-src-v2.7.5.tar.gz sha256 65d3ded5007d5bb58fc3b76013913596fd42ed7326310d67c668ddf9a017a179 luvi-v2.7.6.tar.gz

View File

@ -4,9 +4,8 @@
# #
################################################################################ ################################################################################
LUVI_VERSION = v2.7.5 LUVI_VERSION = v2.7.6
LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz LUVI_SITE = $(call github,luvit,luvi,$(LUVI_VERSION))
LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
LUVI_LICENSE = Apache-2.0 LUVI_LICENSE = Apache-2.0
LUVI_LICENSE_FILES = LICENSE.txt LUVI_LICENSE_FILES = LICENSE.txt
LUVI_DEPENDENCIES = libuv luajit luv host-luajit LUVI_DEPENDENCIES = libuv luajit luv host-luajit

View File

@ -1,2 +1,2 @@
# From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum # From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum
sha512 801adcc2ae483f81edf6bfba73090b6b8f710370e48764f08a62da71d617157075bea01593c2535ad5ba71dcb5e0cfe83cec9a65180a6e8b9e0d214bdee79883 LVM2.2.02.171.tgz sha512 c2ea8beafe006abf9282f51ec98600fd0ebff816d53c10ecbb19bbf336ada4825135cf9c92ccd364afb18f8b1d7e163eff5bdec8dfdd70dfb9ba45db2f6bdd5e LVM2.2.02.173.tgz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LVM2_VERSION = 2.02.171 LVM2_VERSION = 2.02.173
LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz
LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases
LVM2_INSTALL_STAGING = YES LVM2_INSTALL_STAGING = YES

View File

@ -1,4 +1,2 @@
# From http://lists.nongnu.org/archive/html/lzip-bug/2016-06/msg00002.html # From http://lists.nongnu.org/archive/html/lzip-bug/2017-05/msg00000.html
sha1 ef42f3209d02c3b3c217a61c8f127bcb8747b128 lzip-1.18.tar.gz sha256 ffadc4f56be1bc0d3ae155ec4527bd003133bdc703a753b2cc683f610e646ba9 lzip-1.19.tar.gz
# Locally calculated after checking pgp signature
sha256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd lzip-1.18.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
LZIP_VERSION = 1.18 LZIP_VERSION = 1.19
LZIP_SITE = http://download.savannah.gnu.org/releases/lzip LZIP_SITE = http://download.savannah.gnu.org/releases/lzip
LZIP_LICENSE = GPL-2.0+ LZIP_LICENSE = GPL-2.0+
LZIP_LICENSE_FILES = COPYING LZIP_LICENSE_FILES = COPYING

View File

@ -1,2 +1,4 @@
# From http://www.oberhumer.com/opensource/lzo/ # From http://www.oberhumer.com/opensource/lzo/
sha1 e2a60aca818836181e7e6f8c4f2c323aca6ac057 lzo-2.09.tar.gz sha1 4924676a9bae5db58ef129dc1cebce3baa3c4b5d lzo-2.10.tar.gz
# Locally computed
sha256 c0f892943208266f9b6543b3ae308fab6284c5c90e627931446fb49b4221a072 lzo-2.10.tar.gz

View File

@ -4,14 +4,12 @@
# #
################################################################################ ################################################################################
LZO_VERSION = 2.09 LZO_VERSION = 2.10
LZO_SITE = http://www.oberhumer.com/opensource/lzo/download LZO_SITE = http://www.oberhumer.com/opensource/lzo/download
LZO_LICENSE = GPL-2.0+ LZO_LICENSE = GPL-2.0+
LZO_LICENSE_FILES = COPYING LZO_LICENSE_FILES = COPYING
LZO_INSTALL_STAGING = YES LZO_INSTALL_STAGING = YES
# Ships a beta libtool version hence our patch doesn't apply. LZO_SUPPORTS_IN_SOURCE_BUILD = NO
# Run autoreconf to regenerate ltmain.sh.
LZO_AUTORECONF = YES
$(eval $(autotools-package)) $(eval $(cmake-package))
$(eval $(host-autotools-package)) $(eval $(host-cmake-package))

View File

@ -1,31 +0,0 @@
From 36aad32283eae5b47a05e3adfa3f5f6a7b1b55c0 Mon Sep 17 00:00:00 2001
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Date: Sun, 11 Jun 2017 10:02:39 +0200
Subject: [PATCH] memutil.h: add missing include for va_list
Fixes compile error with uclibc-ng:
In file included from mcelog.c:51:0:
memutil.h:4:48: error: unknown type name 'va_list'
int xvasprintf(char **ret, const char *format, va_list ap);
Patch sent upstream: https://github.com/andikleen/mcelog/pull/54
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
memutil.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/memutil.h b/memutil.h
index 81028e9..dbed7fa 100644
--- a/memutil.h
+++ b/memutil.h
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <stdarg.h>
int xasprintf(char **strp, const char *fmt, ...);
int xvasprintf(char **ret, const char *format, va_list ap);
--
2.11.0

View File

@ -1,2 +1,2 @@
# Locally computed # Locally computed
sha256 825644a6cfd9b149e848d91d322724f2fb48f3a98441a25d9d38a5dbe02fe1ef mcelog-v152.tar.gz sha256 d8f3dde21b2e0d76740f374385817c11b3fd69b095a186a6dd12c7b0ba0cca8f mcelog-v153.tar.gz

View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
MCELOG_VERSION = v152 MCELOG_VERSION = v153
MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git MCELOG_SITE = $(BR2_KERNEL_MIRROR)/scm/utils/cpu/mce/mcelog.git
MCELOG_SITE_METHOD = git MCELOG_SITE_METHOD = git
MCELOG_LICENSE = GPL-2.0 MCELOG_LICENSE = GPL-2.0

View File

@ -1,2 +1,2 @@
# From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc # From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc
sha256 8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68 mdadm-3.3.4.tar.xz sha256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 mdadm-4.0.tar.xz

View File

@ -4,14 +4,14 @@
# #
################################################################################ ################################################################################
MDADM_VERSION = 3.3.4 MDADM_VERSION = 4.0
MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz
MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm
MDADM_LICENSE = GPL-2.0+ MDADM_LICENSE = GPL-2.0+
MDADM_LICENSE_FILES = COPYING MDADM_LICENSE_FILES = COPYING
MDADM_MAKE_OPTS = \ MDADM_MAKE_OPTS = \
CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm CFLAGS="$(TARGET_CFLAGS) -DNO_COROSYNC -DNO_DLM" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm
MDADM_INSTALL_TARGET_OPTS = \ MDADM_INSTALL_TARGET_OPTS = \
DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm

View File

@ -1,4 +1,4 @@
# From http://www.memcached.org/files/memcached-1.4.37.tar.gz.sha1 # From http://www.memcached.org/files/memcached-1.5.0.tar.gz.sha1
sha1 6a6c2ab70e9470fef939afff1cb58b7602077611 memcached-1.4.37.tar.gz sha1 e12af93e63c05ab7e89398e4cfd0bfc7b7bff1c5 memcached-1.5.0.tar.gz
# Calculated based on the hash above # Calculated based on the hash above
sha256 2f335ab9110ce39036c5271ef39a582a852e424bc9659e421844073cfdf8606b memcached-1.4.37.tar.gz sha256 c001f812024bb461b5e4d7d0506daab63dff9614eea26f46536c3b7e1e601c32 memcached-1.5.0.tar.gz

Some files were not shown because too many files have changed in this diff Show More