Commit 7cf99fba authored by David Mondou's avatar David Mondou
Browse files

Merge branch 'rename-vesta-500' into 'master'

Rename vesta 500

See merge request vesta/meta-vesta!110
parents 01cc50eb bb614473
......@@ -19,7 +19,7 @@ KERNEL_DEVICETREE = "vesta-100.dtb"
KERNEL_DEVICETREE += "vesta-200.dtb"
KERNEL_DEVICETREE += "vesta-300.dtb"
KERNEL_DEVICETREE += "vesta-400.dtb"
KERNEL_DEVICETREE += "vesta-300B.dtb"
KERNEL_DEVICETREE += "vesta-500.dtb"
KERNEL_DEVICETREE += "310-00110-0003.dtb 310-00121-0001.dtb"
PREFERRED_PROVIDER_u-boot = "u-boot-vesta"
PREFERRED_VERSION_u-boot = "2016.03"
......
From 6f8e7d4b64a5cd4f0f4d5f902b4d70dd608a52ee Mon Sep 17 00:00:00 2001
From: Tony K Nadackal <tony.kn@gadgeon.com>
Date: Thu, 10 May 2018 16:54:40 +0530
Subject: [PATCH] BugFix: Added board id of 300B
---
board/rigado/vesta/plugin.S | 5 +++--
board/rigado/vesta/vesta.c | 5 +++--
common/cmd_getboard.c | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/board/rigado/vesta/plugin.S b/board/rigado/vesta/plugin.S
index ea63de5..f9cdba9 100644
--- a/board/rigado/vesta/plugin.S
+++ b/board/rigado/vesta/plugin.S
@@ -22,7 +22,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
+#define VESTA_300B 0x01F80000
+#define VESTA_300B1 0x007c0000
#define MX6ULL_CPU_ID 0x65
/* DDR script */
@@ -392,7 +393,7 @@
ldr r2, =#ULL_ID_MASK
and r1, r1, r2
- ldr r2, =VESTA_300B
+ ldr r2, =VESTA_300B1
cmp r1, r2
beq v300B
b end
diff --git a/board/rigado/vesta/vesta.c b/board/rigado/vesta/vesta.c
index e662df1..0377831 100644
--- a/board/rigado/vesta/vesta.c
+++ b/board/rigado/vesta/vesta.c
@@ -45,7 +45,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
+#define VESTA_300B 0x01F80000
+#define VESTA_300B1 0x007c0000
#ifdef CONFIG_FSL_FASTBOOT
#include <fsl_fastboot.h>
@@ -635,7 +636,7 @@ int checkboard(void)
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0 )?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if ((board_id & ULL_ID_MASK) == VESTA_300B){
+ if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
puts("Board: Vesta 300B\n");
}
else {
diff --git a/common/cmd_getboard.c b/common/cmd_getboard.c
index fd9c587..6b1300e 100644
--- a/common/cmd_getboard.c
+++ b/common/cmd_getboard.c
@@ -29,7 +29,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
+#define VESTA_300B 0x01F80000
+#define VESTA_300B1 0x007c0000
DECLARE_GLOBAL_DATA_PTR;
@@ -39,7 +40,7 @@ static int do_getboard(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0)?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if ((board_id & ULL_ID_MASK) == VESTA_300B){
+ if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
setenv("board_type", "vesta-300B");
setenv("fdt_file", "zImage-vesta-300B.dtb");
}
--
2.7.4
From bd039dc775091256be37b9434d8fe31e7979ea74 Mon Sep 17 00:00:00 2001
From: Tony K Nadackal <tony.kn@gadgeon.com>
Date: Thu, 10 May 2018 16:54:40 +0530
Subject: [PATCH] BugFix: Changes board detection logic for 300B boards
---
board/rigado/vesta/plugin.S | 25 -------------------------
board/rigado/vesta/vesta.c | 14 +-------------
common/cmd_getboard.c | 16 ++--------------
3 files changed, 3 insertions(+), 52 deletions(-)
diff --git a/board/rigado/vesta/plugin.S b/board/rigado/vesta/plugin.S
index ea63de5..ced9f15 100644
--- a/board/rigado/vesta/plugin.S
+++ b/board/rigado/vesta/plugin.S
@@ -19,10 +19,6 @@
#define VESTA_64M_NOR 0x1
/*ULL board id registers */
-#define OCOTP_GP1 0x021bc660
-#define OCOTP_GP2 0x021bc670
-#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
#define MX6ULL_CPU_ID 0x65
/* DDR script */
@@ -374,29 +370,8 @@
and r1, r1, #0xFF
ldr r2, =#MX6ULL_CPU_ID
cmp r1, r2
- bne ulcmp
-
- ldr r0, =OCOTP_BASE_ADDR
-
-/*OCOTP_GP1 offset 0x660 */
- ldr r1, [r0, #0x660]
- ldr r2, =#ULL_ID_MASK
- and r1, r1, r2
-
- ldr r2, =VESTA_300B
- cmp r1, r2
beq v300B
-/*OCOTP_GP2 offset 0x670 */
- ldr r1, [r0, #0x670]
- ldr r2, =#ULL_ID_MASK
- and r1, r1, r2
-
- ldr r2, =VESTA_300B
- cmp r1, r2
- beq v300B
- b end
-
ulcmp:
ldr r0, =OCOTP_BASE_ADDR
/*OCOTP_GP34 offset 0x940 */
diff --git a/board/rigado/vesta/vesta.c b/board/rigado/vesta/vesta.c
index e662df1..2fea84b 100644
--- a/board/rigado/vesta/vesta.c
+++ b/board/rigado/vesta/vesta.c
@@ -41,12 +41,6 @@
#define VESTA_RAD 0x0
#define VESTA_64M_NOR 0x1
-/*ULL board id registers */
-#define OCOTP_GP1 0x021bc660
-#define OCOTP_GP2 0x021bc670
-#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
-
#ifdef CONFIG_FSL_FASTBOOT
#include <fsl_fastboot.h>
#ifdef CONFIG_ANDROID_RECOVERY
@@ -634,13 +628,7 @@ int checkboard(void)
unsigned int board_id;
if (is_cpu_type(MXC_CPU_MX6ULL)) {
- board_id = (readl(OCOTP_GP1) != 0 )?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if ((board_id & ULL_ID_MASK) == VESTA_300B){
- puts("Board: Vesta 300B\n");
- }
- else {
- printf ("Board id not recognized\n");
- }
+ puts("Board: Vesta 300B\n");
}
else if (is_cpu_type(MXC_CPU_MX6UL)) {
board_id = readl(OCOTP_GP34);
diff --git a/common/cmd_getboard.c b/common/cmd_getboard.c
index fd9c587..56ba1cb 100644
--- a/common/cmd_getboard.c
+++ b/common/cmd_getboard.c
@@ -25,12 +25,6 @@
#define VESTA_RAD 0x0
#define VESTA_64M_NOR 0x1
-/*ULL board id registers */
-#define OCOTP_GP1 0x021bc660
-#define OCOTP_GP2 0x021bc670
-#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x007c0000
-
DECLARE_GLOBAL_DATA_PTR;
static int do_getboard(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -38,14 +32,8 @@ static int do_getboard(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
unsigned int board_id;
if (is_cpu_type(MXC_CPU_MX6ULL)) {
- board_id = (readl(OCOTP_GP1) != 0)?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if ((board_id & ULL_ID_MASK) == VESTA_300B){
- setenv("board_type", "vesta-300B");
- setenv("fdt_file", "zImage-vesta-300B.dtb");
- }
- else {
- printf ("Board id not recognized\n");
- }
+ setenv("board_type", "vesta-300B");
+ setenv("fdt_file", "zImage-vesta-300B.dtb");
}
else if (is_cpu_type(MXC_CPU_MX6UL)) {
board_id = readl(OCOTP_GP34);
--
2.7.4
diff --git a/board/rigado/vesta/plugin.S b/board/rigado/vesta/plugin.S
index f9cdba9..f493c72 100644
--- a/board/rigado/vesta/plugin.S
+++ b/board/rigado/vesta/plugin.S
@@ -22,8 +22,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
#define MX6ULL_CPU_ID 0x65
/* DDR script */
@@ -384,18 +384,18 @@
ldr r2, =#ULL_ID_MASK
and r1, r1, r2
- ldr r2, =VESTA_300B
+ ldr r2, =VESTA_500
cmp r1, r2
- beq v300B
+ beq v500
/*OCOTP_GP2 offset 0x670 */
ldr r1, [r0, #0x670]
ldr r2, =#ULL_ID_MASK
and r1, r1, r2
- ldr r2, =VESTA_300B1
+ ldr r2, =VESTA_500_1
cmp r1, r2
- beq v300B
+ beq v500
b end
ulcmp:
@@ -442,7 +442,7 @@ v300:
v400:
imx6ul_ddr3_setting_4g
b end
-v300B:
+v500:
imx6ul_ddr3_setting_4g
end:
nop
diff --git a/board/rigado/vesta/vesta.c b/board/rigado/vesta/vesta.c
index 0377831..ac11c74 100644
--- a/board/rigado/vesta/vesta.c
+++ b/board/rigado/vesta/vesta.c
@@ -45,8 +45,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
#ifdef CONFIG_FSL_FASTBOOT
#include <fsl_fastboot.h>
@@ -636,8 +636,8 @@ int checkboard(void)
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0 )?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
- puts("Board: Vesta 300B\n");
+ if (((board_id & ULL_ID_MASK) == VESTA_500) || ((board_id & ULL_ID_MASK) == VESTA_500_1)) {
+ puts("Board: Vesta 500\n");
}
else {
printf ("Board id not recognized\n");
diff --git a/common/cmd_getboard.c b/common/cmd_getboard.c
index 6b1300e..0a012b1 100644
--- a/common/cmd_getboard.c
+++ b/common/cmd_getboard.c
@@ -29,8 +29,8 @@
#define OCOTP_GP1 0x021bc660
#define OCOTP_GP2 0x021bc670
#define ULL_ID_MASK 0x0FFC0000
-#define VESTA_300B 0x01F80000
-#define VESTA_300B1 0x007c0000
+#define VESTA_500 0x01F80000
+#define VESTA_500_1 0x007c0000
DECLARE_GLOBAL_DATA_PTR;
@@ -40,9 +40,9 @@ static int do_getboard(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]
if (is_cpu_type(MXC_CPU_MX6ULL)) {
board_id = (readl(OCOTP_GP1) != 0)?readl(OCOTP_GP1):readl(OCOTP_GP2);
- if (((board_id & ULL_ID_MASK) == VESTA_300B) || ((board_id & ULL_ID_MASK) == VESTA_300B1)) {
- setenv("board_type", "vesta-300B");
- setenv("fdt_file", "zImage-vesta-300B.dtb");
+ if (((board_id & ULL_ID_MASK) == VESTA_500) || ((board_id & ULL_ID_MASK) == VESTA_500_1)) {
+ setenv("board_type", "vesta-500");
+ setenv("fdt_file", "zImage-vesta-500.dtb");
}
else {
printf ("Board id not recognized\n");
......@@ -32,9 +32,10 @@ SRC_URI += "file://0006-Added-defconfig-for-general-machine.patch"
SRC_URI += "file://0007-GCC-6.4-compatibility-fix.patch"
SRC_URI += "file://0008-Added-support-for-SPI-flash-chips-MACRONIX-SPANSION.patch"
SRC_URI += "file://0009-Added-defconfig-for-boards-with-qspi-flash.patch"
SRC_URI += "file://0010-BugFix-Changes-board-detection-logic-for-300B-boards.patch"
SRC_URI += "file://0010-BugFix-Added-board-id-of-300B.patch"
SRC_URI += "file://0011-Enable_retry_Disable_bootdelay.patch"
SRC_URI += "file://0012-Fix_multiple_definition_warning.patch"
SRC_URI += "file://0013-Rename-300B-to-500.patch"
SRC_URI += "file://qspi-header"
S = "${WORKDIR}/git"
......
......@@ -2,8 +2,8 @@
#
# Start bluettooh coexistance user-space daemon. This has to occur after
# the dbus has been started, or the daemon will crash
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-300B" ]]; then
echo "Vesta-300B detected, abtfilt daemon is not needed";
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-500" ]]; then
echo "Vesta-500 detected, abtfilt daemon is not needed";
else
echo "Running abtfilt daemon"
......
......@@ -14,12 +14,12 @@ set_antenna(){
ln -s /lib/firmware/$antenna $bdwlan
}
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-300B" ]]; then
if [[ $(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2) = "vesta-500" ]]; then
if [ ! -f $bdwlan ]; then
set_antenna
fi
echo "Vesta-300B: running qca9377 scripts...";
echo "Vesta-500: running qca9377 scripts...";
/etc/init.d/qca9377_setmac.sh
/etc/init.d/qca9377_hciattach.sh
else
......
......@@ -153,7 +153,7 @@ get_ull_sn_board () {
}
# Searching for a string matches with the format board_type=XXXX
if [[ "$(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2)" = "vesta-300B" ]] ; then
if [[ "$(for i in $(cat /proc/cmdline);do if [[ $i = "board_type="* ]]; then echo $i; fi; done | cut -d= -f2)" = "vesta-500" ]] ; then
#imx6ull fuses
BSN_FUSE1=HW_OCOTP_GP1
USN_FUSE1=HW_OCOTP_GP2
......
......@@ -4,8 +4,8 @@ SUMMARY = "Rigado's general purpose tool"
DESCRIPTION = "A tool for the gateway which changes functionality based on how it is linked"
# The latest commit
SRCREV = "d8aea11c5d83be6c27610fda8e29e57ead898db9"
SRCBRANCH ?= "v3.0.0"
SRCREV = "746b46c73bca7ead87f5c2f8277edce681b74bec"
SRCBRANCH ?= "v2.5.1"
require recipes-core/rigtools/rigtools.inc
......@@ -36,38 +36,32 @@ generate_mac()
}
#genmac
echo "generating mac address..."
logger "generating mac address..."
generate_mac
#hard reset the bmd
echo "resetting bmd..."
logger "resetting bmd..."
reset_bmd 69
echo "detaching..."
logger "detaching..."
killall -9 btattach
sleep 2
#attach wlan
echo "attaching hci0 (wlan)..."
btattach -B /dev/ttymxc0 &
sleep 2
hciconfig hci0 up
#attach
echo "attaching hci1 (bmd)..."
logger "attaching hci1 (bmd)..."
btattach -B /dev/ttymxc2 -S 1000000 &
#verify btattach was successful
if [ $? -eq 0 ]; then
sleep 2
echo "setting mac address: $mac"
logger "setting mac address: $mac"
btmgmt --index 1 static-addr $mac
sleep 2
echo "auto-power enable"
logger "auto-power enable"
btmgmt --index 1 auto-power
sleep 2
else
echo "FAILED: attaching hci1(bmd)..."
logger "FAILED: attaching hci1(bmd)..."
exit 1
fi
......
......@@ -10,7 +10,7 @@
TYPE=$(board_serial_number | cut -b 2-4)
if [ "$TYPE" == "126" ]; then
/usr/rigado/scripts/attach_bmd345.sh 2>&1 | logger -p user.info &
/usr/rigado/scripts/attach_bmd345.sh
else
/usr/rigado/scripts/attach_bmd300.sh 2>&1 | logger -p user.info
fi
......@@ -35,7 +35,7 @@ if [ $? -ne 0 ]; then
fi
#enable start_hci.sh at startup
update-rc.d start_hci.sh start 99 5 .
update-rc.d start_hci.sh start 91 5 .
#System changes have been made,
#create a link to undo theses changes.
......
......@@ -11,8 +11,8 @@ SRC_URI += "file://defconfig \
file://device-tree/vesta-300-mfg.dts \
file://device-tree/vesta-400.dts \
file://device-tree/vesta-400-mfg.dts \
file://device-tree/vesta-300B.dts \
file://device-tree/vesta-300B-mfg.dts \
file://device-tree/vesta-500.dts \
file://device-tree/vesta-500-mfg.dts \
file://device-tree/vesta-64M-nor.dts \
file://device-tree/vesta-64M-nor-mfg.dts \
file://device-tree/vesta-rad-mfg.dts \
......@@ -48,8 +48,8 @@ do_configure_append() {
cp ${WORKDIR}/device-tree/vesta-300-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300B.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300B-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-mfg.dts ${S}/arch/${ARCH}/boot/dts
......
......@@ -14,8 +14,8 @@
/ {
model = "Rigado Vesta 300B Board ";
compatible = "fsl,vesta-500", "fsl,vesta-300B", "fsl,imx6ull";
model = "Rigado Vesta 500 Board ";
compatible = "fsl,vesta-500", "fsl,imx6ull";
version = "1.0.0";
......
......@@ -14,10 +14,9 @@
/ {
model = "Rigado Vesta 300B Board ";
compatible = "fsl,vesta-500", "fsl,vesta-300B", "fsl,imx6ull";
version = "1.0.0";
model = "Rigado Vesta 500 Board ";
compatible = "fsl,vesta-500", "fsl,imx6ull";
version = "1.0.0";
chosen {
stdout-path = &uart2;
......@@ -59,7 +58,7 @@
regulator-name = "vref-3v3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
};
};
/* All expansion cards should be listed here, as disabled */
......@@ -466,24 +465,24 @@
};
&usdhc1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
no-1-8-v;
non-removable;
bus-width = <4>;
pm-ignore-notify;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc1 &pinctrl_wifi>;
no-1-8-v;
non-removable;
bus-width = <4>;
pm-ignore-notify;
status = "okay";
};
&usdhc2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
non-removable;
bus-width = <8>;
keep-power-in-suspend;
enable-sdio-wakeup;
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2>;
no-1-8-v;
non-removable;
bus-width = <8>;
keep-power-in-suspend;
enable-sdio-wakeup;
status = "okay";
};
/* Vesta expansion card DT overlay manager - based on beaglebone cape manager */
......
[PATCH] replace krb5-config with pkg-config
From ed70f0623708b8a6c1f58a5d243d87c5ff45b24d Mon Sep 17 00:00:00 2001
From: Roy Li <rongqing.li@windriver.com>
Date: Tue, 26 Apr 2016 13:13:01 +0800
Subject: [PATCH] replace krb5-config with pkg-config
Upstream-Status: Pending
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
configure.ac | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index e99b303..dc93f39 100644
index 5569a26..56b0380 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1196,7 +1196,7 @@ AC_ARG_WITH(gssapi,
@@ -1290,7 +1290,7 @@ AC_ARG_WITH(gssapi,
fi
])
......@@ -20,7 +24,7 @@ index e99b303..dc93f39 100644
save_CPPFLAGS="$CPPFLAGS"
AC_MSG_CHECKING([if GSS-API support is requested])
@@ -1207,7 +1207,7 @@ if test x"$want_gss" = xyes; then
@@ -1301,7 +1301,7 @@ if test x"$want_gss" = xyes; then
if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
elif test -f "$KRB5CONFIG"; then
......@@ -29,7 +33,7 @@ index e99b303..dc93f39 100644
elif test "$GSSAPI_ROOT" != "yes"; then
GSSAPI_INCS="-I$GSSAPI_ROOT/include"
fi
@@ -1300,7 +1300,7 @@ if test x"$want_gss" = xyes; then
@@ -1394,7 +1394,7 @@ if test x"$want_gss" = xyes; then
elif test -f "$KRB5CONFIG"; then
dnl krb5-config doesn't have --libs-only-L or similar, put everything
dnl into LIBS
......@@ -38,6 +42,3 @@ index e99b303..dc93f39 100644
LIBS="$gss_libs $LIBS"
else
case $host in
--
1.9.1
From c9332fa5e84f24da300b42b1a931ade929d3e27d Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Tue, 1 Aug 2017 17:17:06 +0200
Subject: [PATCH] file: output the correct buffer to the user
Regression brought by 7c312f84ea930d8 (April 2017)
CVE: CVE-2017-1000099