mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-10 10:10:28 +03:00
Compare commits
42 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
adb26f1fee | ||
|
fd656bcec4 | ||
|
637f2b5e12 | ||
|
371d7e8495 | ||
|
0cf9b6cebd | ||
|
71c80c0b69 | ||
|
|
9ced00d686 | ||
|
2ab9c34961 | ||
|
3e0fae4fd2 | ||
|
4c2d473780 | ||
|
|
857a01ad7d | ||
|
|
c57572b95e | ||
|
|
2e18e017c5 | ||
|
|
6c97236d04 | ||
|
|
fe3ac2c20a | ||
|
|
6329ed2a49 | ||
|
669edf51ee | ||
|
|
75e616d4bb | ||
|
4d757cfd39 | ||
|
|
226e5e946c | ||
|
|
4fb281dbb8 | ||
|
7b4366005d | ||
|
|
f8bff449e5 | ||
|
|
7776e245c7 | ||
|
|
427354a3b9 | ||
|
13ade0145c | ||
|
|
9d2c1a7146 | ||
|
|
de3234fd1e | ||
|
434a3e4933 | ||
|
|
8a658c4654 | ||
|
|
a23693b0cd | ||
|
|
f68d075154 | ||
|
29365654c6 | ||
|
|
01dd528fce | ||
|
|
e9feb0845f | ||
|
04b970957f | ||
|
67bd585fba | ||
|
8418639346 | ||
|
|
ee57b63fc8 | ||
|
|
f591058267 | ||
|
|
727b7bfdde | ||
|
884688f1a0 |
35
CHANGES
35
CHANGES
@@ -1,3 +1,38 @@
|
||||
2017.11.2, Released January 21st, 2018
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
External toolchain: libatomic is now also copied for musl
|
||||
based toolchains.
|
||||
|
||||
nconfig: Fix for ncurses/ncursesw linking issue causing crashes.
|
||||
|
||||
System: Only show getty options when busybox init or sysvinit
|
||||
are used.
|
||||
|
||||
Infrastructure: Fix build issue for autotools based packages
|
||||
checking for C++ support on toolchains without C++ support and
|
||||
on a distro lacking /lib/cpp (E.G. Arch Linux).
|
||||
|
||||
Pie charts generated by 'graph-build' or 'graph-size' are now
|
||||
sorted according to the size of each piece.
|
||||
|
||||
Updated/fixed packages: asterisk, avahi, bind, busybox,
|
||||
coreutils, eeprog, intel-microcode, iputils, irssi, kmsxx,
|
||||
libiio, linux-firmware, lz4, mariadb, matchbox-lib, mcookie,
|
||||
ntp, php, pound, rpcbind, tar, ti-cgt-pru, webkitgtk, xen,
|
||||
xlib_libXpm
|
||||
|
||||
Issues resolved (http://bugs.buildroot.org):
|
||||
|
||||
#9996: lz4 package does not install lz4 binaries in target
|
||||
#10176: Rsyslog's S01logging is deleted by Busybox.mk from...
|
||||
#10216: package/x11r7/mcookie/mcookie.c:207: bad size ?
|
||||
#10301: systemd/getty unused options
|
||||
#10331: kmsxx, host installation fails with BR2_SHARED_...
|
||||
#10556: Building ntp package with SSL library libressl...
|
||||
#10641: avahi-autoipd not starting when using systemd-tmpfiles
|
||||
|
||||
2017.11.1, Released December 31th, 2017
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
@@ -1763,6 +1763,7 @@ F: package/libpri/
|
||||
F: package/libseccomp/
|
||||
F: package/libss7/
|
||||
F: package/linux-tools/
|
||||
F: package/matchbox*
|
||||
F: package/mesa3d-headers/
|
||||
F: package/nbd/
|
||||
F: package/nut/
|
||||
|
||||
4
Makefile
4
Makefile
@@ -87,9 +87,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2017.11.1
|
||||
export BR2_VERSION := 2017.11.2
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1514710000
|
||||
BR2_VERSION_EPOCH = 1516569000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -398,7 +398,7 @@ NLS_OPTS = --disable-nls
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
TARGET_CONFIGURE_OPTS += CXX=false
|
||||
TARGET_CONFIGURE_OPTS += CXX=false CXXCPP=cpp
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
From e7de812c979d219765fbf1292f0e150bfa087716 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Sun, 18 Jun 2017 21:54:16 +0200
|
||||
Subject: [PATCH] configure: in cross-complation, assume eventfd are available
|
||||
|
||||
eventfd have been in the kernel since 2.6.22, and in glibc since 2.8,
|
||||
repectively released in July 2007 and April 2008, almost a decade ago
|
||||
now.
|
||||
|
||||
Assume that no one building from now on for cross-compilation will be
|
||||
unlucky enough to get versions older than that...
|
||||
|
||||
As such, in cross-compilation, assume eventfd are available.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
configure.ac | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 1c20517864..474d17ae55 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1107,7 +1107,9 @@ AC_RUN_IFELSE(
|
||||
[return eventfd(0, EFD_NONBLOCK | EFD_SEMAPHORE) == -1;])],
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE([HAVE_EVENTFD], 1, [Define to 1 if your system supports eventfd and the EFD_NONBLOCK and EFD_SEMAPHORE flags.]),
|
||||
- AC_MSG_RESULT(no)
|
||||
+ AC_MSG_RESULT(no),
|
||||
+ AC_MSG_RESULT([cross-compile; assume yes])
|
||||
+ AC_DEFINE([HAVE_EVENTFD], 1, [Define to 1 if your system supports eventfd and the EFD_NONBLOCK and EFD_SEMAPHORE flags.])
|
||||
)
|
||||
|
||||
AST_GCC_ATTRIBUTE(pure)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 c122fbe88e089737fa2c80356762ceed38498aa26da1dfdd4da5506f9b135696 asterisk-14.5.0.tar.gz
|
||||
sha256 6525170fa16fecb08cb3cde2c1bd5d3140df55b14e4561ac0771fbd1e04b3b75 asterisk-14.7.5.tar.gz
|
||||
|
||||
# sha1 from: http://downloads.asterisk.org/pub/telephony/sounds/releases
|
||||
# sha256 locally computed
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ASTERISK_VERSION = 14.5.0
|
||||
ASTERISK_VERSION = 14.7.5
|
||||
# Use the github mirror: it's an official mirror maintained by Digium, and
|
||||
# provides tarballs, which the main Asterisk git tree (behind Gerrit) does not.
|
||||
ASTERISK_SITE = $(call github,asterisk,asterisk,$(ASTERISK_VERSION))
|
||||
|
||||
@@ -1 +1 @@
|
||||
d /tmp/avahi-autopid 0755 avahi avahi
|
||||
d /tmp/avahi-autoipd 0755 avahi avahi
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Verified from http://ftp.isc.org/isc/bind9/9.11.2/bind-9.11.2.tar.gz.sha256.asc
|
||||
sha256 7f46ad8620f7c3b0ac375d7a5211b15677708fda84ce25d7aeb7222fe2e3c77a bind-9.11.2.tar.gz
|
||||
# Verified from http://ftp.isc.org/isc/bind9/9.11.2-P1/bind-9.11.2-P1.tar.gz.sha256.asc
|
||||
sha256 cec31548832fca3f85d95178d4019b7d702039e8595d4c93914feba337df1212 bind-9.11.2-P1.tar.gz
|
||||
sha256 d3906dfe153e2c48440d3ca1d5319f5e89b4b820cdfc5d0779c23d7ac2b175e9 COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BIND_VERSION = 9.11.2
|
||||
BIND_VERSION = 9.11.2-P1
|
||||
BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
# bind does not support parallel builds.
|
||||
BIND_MAKE = $(MAKE1)
|
||||
|
||||
@@ -221,7 +221,7 @@ define BUSYBOX_INSTALL_LOGGING_SCRIPT
|
||||
if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \
|
||||
$(INSTALL) -m 0755 -D package/busybox/S01logging \
|
||||
$(TARGET_DIR)/etc/init.d/S01logging; \
|
||||
else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi
|
||||
fi
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_INIT_BUSYBOX),y)
|
||||
|
||||
@@ -56,8 +56,8 @@ COREUTILS_CONF_ENV = ac_cv_c_restrict=no \
|
||||
INSTALL_PROGRAM=$(INSTALL)
|
||||
|
||||
COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \
|
||||
ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \
|
||||
uname join
|
||||
kill link ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir \
|
||||
vdir sleep stty sync touch true uname join
|
||||
|
||||
# If both coreutils and busybox are selected, make certain coreutils
|
||||
# wins the fight over who gets to have their utils actually installed.
|
||||
|
||||
@@ -3,4 +3,4 @@ config BR2_PACKAGE_EEPROG
|
||||
help
|
||||
Simple tool to read/write i2c eeprom chips.
|
||||
|
||||
http://codesink.org/eeprog.html
|
||||
http://www.codesink.org/eeprog.html
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 4fd44769bf52a7ac11e90651a307aa6e56ca6e1a814e50d750ba8207973bee93 microcode-20170707.tgz
|
||||
sha256 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130 microcode-20180108.tgz
|
||||
sha256 6d4deb65ca688d930e188bf93f78430f134097b161e6df4a2ef00728e14965e3 license.txt
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
INTEL_MICROCODE_VERSION = 20170707
|
||||
INTEL_MICROCODE_VERSION = 20180108
|
||||
INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz
|
||||
INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/26925/eng
|
||||
INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/27431/eng
|
||||
INTEL_MICROCODE_STRIP_COMPONENTS = 0
|
||||
INTEL_MICROCODE_LICENSE = PROPRIETARY
|
||||
INTEL_MICROCODE_LICENSE_FILES = license.txt
|
||||
|
||||
@@ -69,4 +69,9 @@ define IPUTILS_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
|
||||
endef
|
||||
|
||||
define IPUTILS_PERMISSIONS
|
||||
/bin/ping f 4755 0 0 - - - - -
|
||||
/bin/traceroute6 f 4755 0 0 - - - - -
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914 irssi-1.0.5.tar.xz
|
||||
sha256 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585 irssi-1.0.6.tar.xz
|
||||
# Locally calculated
|
||||
sha256 a1a27cb2ecee8d5378fbb3562f577104a445d6d66fee89286e16758305e63e2b COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IRSSI_VERSION = 1.0.5
|
||||
IRSSI_VERSION = 1.0.6
|
||||
IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz
|
||||
# Do not use the github helper here. The generated tarball is *NOT* the
|
||||
# same as the one uploaded by upstream for the release.
|
||||
|
||||
@@ -44,12 +44,15 @@ define KMSXX_INSTALL_TARGET_CMDS
|
||||
$(KMSXX_INSTALL_TARGET_TESTS)
|
||||
endef
|
||||
|
||||
# kmsxx only builds shared or static libraries, so when
|
||||
# BR2_SHARED_STATIC_LIBS=y, we don't have any static library to
|
||||
# install
|
||||
define KMSXX_INSTALL_STAGING_CMDS
|
||||
$(foreach l,$(KMSXX_LIBS),\
|
||||
$(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),
|
||||
$(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \
|
||||
$(STAGING_DIR)/usr/lib/lib$(l).so)
|
||||
$(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),
|
||||
$(if $(BR2_STATIC_LIBS),
|
||||
$(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \
|
||||
$(STAGING_DIR)/usr/lib/lib$(l).a)
|
||||
mkdir -p $(STAGING_DIR)/usr/include/$(l)
|
||||
|
||||
@@ -54,8 +54,8 @@ else
|
||||
LIBIIO_CONF_OPTS += -DWITH_IIOD_USBD=OFF
|
||||
endif
|
||||
|
||||
# Avahi support in libiio requires avahi-client, which needs avahi-daemon
|
||||
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON),yy)
|
||||
# Avahi support in libiio requires avahi-client, which needs avahi-daemon and dbus
|
||||
ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
|
||||
LIBIIO_DEPENDENCIES += avahi
|
||||
endif
|
||||
|
||||
|
||||
@@ -324,14 +324,14 @@ LINUX_FIRMWARE_FILES += bnx2x/*
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y)
|
||||
# cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.16.26.0.bin
|
||||
LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.16.26.0.bin cxgb4/t4fw.bin
|
||||
# cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.16.45.0.bin
|
||||
LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.16.45.0.bin cxgb4/t4fw.bin
|
||||
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5),y)
|
||||
# cxgb4/t5fw.bin is a symlink to cxgb4/t5fw-1.16.26.0.bin
|
||||
LINUX_FIRMWARE_FILES += cxgb4/t5fw-1.16.26.0.bin cxgb4/t5fw.bin
|
||||
# cxgb4/t5fw.bin is a symlink to cxgb4/t5fw-1.16.45.0.bin
|
||||
LINUX_FIRMWARE_FILES += cxgb4/t5fw-1.16.45.0.bin cxgb4/t5fw.bin
|
||||
LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware
|
||||
endif
|
||||
|
||||
|
||||
@@ -239,13 +239,13 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "3.2.96" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.2.98" if BR2_KERNEL_HEADERS_3_2
|
||||
default "3.4.113" if BR2_KERNEL_HEADERS_3_4
|
||||
default "3.10.108" if BR2_KERNEL_HEADERS_3_10
|
||||
default "3.12.74" if BR2_KERNEL_HEADERS_3_12
|
||||
default "4.1.48" if BR2_KERNEL_HEADERS_4_1
|
||||
default "4.4.108" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.73" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.4.112" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.77" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.10.17" if BR2_KERNEL_HEADERS_4_10
|
||||
default "4.11.12" if BR2_KERNEL_HEADERS_4_11
|
||||
default "4.12.14" if BR2_KERNEL_HEADERS_4_12
|
||||
|
||||
@@ -18,7 +18,7 @@ LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED
|
||||
endif
|
||||
|
||||
define HOST_LZ4_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
|
||||
endef
|
||||
|
||||
define HOST_LZ4_INSTALL_CMDS
|
||||
@@ -27,7 +27,7 @@ define HOST_LZ4_INSTALL_CMDS
|
||||
endef
|
||||
|
||||
define LZ4_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all
|
||||
endef
|
||||
|
||||
define LZ4_INSTALL_STAGING_CMDS
|
||||
@@ -37,7 +37,7 @@ endef
|
||||
|
||||
define LZ4_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) \
|
||||
PREFIX=/usr install -C $(@D)/lib
|
||||
PREFIX=/usr install -C $(@D)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://downloads.mariadb.org/mariadb/10.1.29/
|
||||
sha256 73bbd5602f52ab5aa4d83f465134871b6c87bda25371d098f6da5a3d98517ed4 mariadb-10.1.29.tar.gz
|
||||
# From https://downloads.mariadb.org/mariadb/10.1.30/
|
||||
sha256 173a5e5a24819e0a469c3bd09b5c98491676c37c6095882a2ea34c5af0996c88 mariadb-10.1.30.tar.gz
|
||||
|
||||
# Hash for license files
|
||||
sha256 69ce89a0cadbe35a858398c258be93c388715e84fc0ca04e5a1fd1aa9770dd3a README
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MARIADB_VERSION = 10.1.29
|
||||
MARIADB_VERSION = 10.1.30
|
||||
MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
|
||||
MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
|
||||
# Tarball no longer contains LGPL license text
|
||||
|
||||
@@ -14,8 +14,8 @@ MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst
|
||||
MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat
|
||||
|
||||
define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
||||
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
|
||||
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile
|
||||
$(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' \
|
||||
$(@D)/Makefile
|
||||
endef
|
||||
|
||||
MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
config BR2_PACKAGE_MATCHBOX_LIB
|
||||
bool "matchbox-lib"
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT
|
||||
help
|
||||
Matchbox common functionality library.
|
||||
|
||||
@@ -10,12 +10,13 @@ MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatch
|
||||
MATCHBOX_LIB_LICENSE = LGPL-2.1+
|
||||
MATCHBOX_LIB_LICENSE_FILES = COPYING
|
||||
MATCHBOX_LIB_INSTALL_STAGING = YES
|
||||
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext
|
||||
MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs
|
||||
MATCHBOX_LIB_DEPENDENCIES = host-pkgconf xlib_libXext
|
||||
MATCHBOX_LIB_CONF_OPTS = --disable-doxygen-docs
|
||||
MATCHBOX_LIB_CONF_ENV = LIBS="-lX11"
|
||||
|
||||
define MATCHBOX_LIB_POST_INSTALL_FIXES
|
||||
$(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \
|
||||
$(SED) 's:-I$(STAGING_DIR)/:-I/:g' \
|
||||
-e 's:-I/usr/include\( \|$$\)::g' \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc
|
||||
endef
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ NTP_CONF_OPTS = \
|
||||
# 0003-ntpq-fpic.patch
|
||||
NTP_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
ifeq ($(BR2_PACKAGE_LIBOPENSSL),y)
|
||||
NTP_CONF_OPTS += --with-crypto
|
||||
NTP_DEPENDENCIES += openssl
|
||||
else
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001
|
||||
From: Andy Postnikov <apostnikov@gmail.com>
|
||||
Date: Sat, 10 Dec 2016 23:51:17 +0300
|
||||
Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64
|
||||
|
||||
Fixes build at -O0.
|
||||
|
||||
[From pull request https://github.com/php/php-src/pull/2236.]
|
||||
Signed-off-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
|
||||
---
|
||||
Zend/zend_multiply.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
|
||||
index 75769db..fbd69ab 100644
|
||||
--- a/Zend/zend_multiply.h
|
||||
+++ b/Zend/zend_multiply.h
|
||||
@@ -75,8 +75,8 @@
|
||||
__asm__("mul %0, %2, %3\n" \
|
||||
"smulh %1, %2, %3\n" \
|
||||
"sub %1, %1, %0, asr #63\n" \
|
||||
- : "=X"(__tmpvar), "=X"(usedval) \
|
||||
- : "X"(a), "X"(b)); \
|
||||
+ : "=&r"(__tmpvar), "=&r"(usedval) \
|
||||
+ : "r"(a), "r"(b)); \
|
||||
if (usedval) (dval) = (double) (a) * (double) (b); \
|
||||
else (lval) = __tmpvar; \
|
||||
} while (0)
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://php.net/downloads.php
|
||||
sha256 074093e9d7d21afedc5106904218a80a47b854abe368d2728ed22184c884893e php-7.1.11.tar.xz
|
||||
sha256 1a0b3f2fb61959b57a3ee01793a77ed3f19bde5aa90c43dcacc85ea32f64fc10 php-7.1.13.tar.xz
|
||||
|
||||
# License file
|
||||
sha256 a44951f93b10c87c3f7cd9f311d95999c57c95ed950eec32b14c1c7ea6baf25e LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PHP_VERSION = 7.1.11
|
||||
PHP_VERSION = 7.1.13
|
||||
PHP_SITE = http://www.php.net/distributions
|
||||
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
|
||||
PHP_INSTALL_STAGING = YES
|
||||
|
||||
127
package/pound/0001-fix-openssl-1.0.2.patch
Normal file
127
package/pound/0001-fix-openssl-1.0.2.patch
Normal file
@@ -0,0 +1,127 @@
|
||||
From eb471de8f26e0367dd08d299d2252fa8b2b958a9 Mon Sep 17 00:00:00 2001
|
||||
From: Emilio <emilio.campos@zevenet.com>
|
||||
Date: Mon, 17 Jul 2017 09:41:32 +0200
|
||||
Subject: [PATCH] [Improvement] Added support to compile pound with openssl
|
||||
1.0.2
|
||||
|
||||
Signed-off-by: Emilio <emilio.campos@zevenet.com>
|
||||
|
||||
new file: dh2048.h
|
||||
modified: svc.c
|
||||
|
||||
Patch was downloaded from 3rd-party repo:
|
||||
https://github.com/zevenet/pound/commit/eb471de8f26e0367dd08d299d2252fa8b2b958a9
|
||||
|
||||
This repo was announced on upstream mailinglist:
|
||||
http://www.apsis.ch/pound/pound_list/archive/2017/2017-07/1500287626000#1500287626000
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
dh2048.h | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
svc.c | 33 +++++++++++++++++++++++++++++++++
|
||||
2 files changed, 86 insertions(+)
|
||||
create mode 100644 dh2048.h
|
||||
|
||||
diff --git a/dh2048.h b/dh2048.h
|
||||
new file mode 100644
|
||||
index 0000000..79c693c
|
||||
--- /dev/null
|
||||
+++ b/dh2048.h
|
||||
@@ -0,0 +1,53 @@
|
||||
+#ifndef HEADER_DH_H
|
||||
+# include <openssl/dh.h>
|
||||
+#endif
|
||||
+
|
||||
+DH *get_dh2048()
|
||||
+{
|
||||
+ static unsigned char dhp_2048[] = {
|
||||
+ 0xBF, 0x6C, 0xC6, 0xBD, 0xEA, 0x10, 0x84, 0x59, 0x40, 0xC2,
|
||||
+ 0xC6, 0xA2, 0x9B, 0x19, 0xD3, 0x2E, 0x2F, 0xAB, 0xE6, 0xE4,
|
||||
+ 0x1E, 0x91, 0x0D, 0x59, 0xDC, 0x96, 0x3F, 0x6E, 0x65, 0x38,
|
||||
+ 0xB9, 0xBE, 0xBB, 0x8F, 0xDF, 0x73, 0xAC, 0xAC, 0xB3, 0x2F,
|
||||
+ 0xA7, 0x02, 0x0B, 0x87, 0xB7, 0x3F, 0x3A, 0x42, 0x8A, 0x94,
|
||||
+ 0xDD, 0xEC, 0x33, 0xA4, 0x25, 0xB1, 0xBF, 0x84, 0x91, 0x87,
|
||||
+ 0xD8, 0x1C, 0x42, 0xB9, 0x8E, 0x00, 0x1F, 0x49, 0xED, 0x57,
|
||||
+ 0xA4, 0x48, 0xB0, 0xCC, 0xD8, 0xB8, 0x83, 0xCA, 0x3E, 0xDF,
|
||||
+ 0xA2, 0xF2, 0x07, 0x71, 0x71, 0x18, 0x1F, 0x50, 0x45, 0x3A,
|
||||
+ 0x66, 0x04, 0x7F, 0x15, 0xB2, 0xA8, 0x02, 0x77, 0xCE, 0xC6,
|
||||
+ 0xF9, 0x7C, 0x63, 0xE4, 0x52, 0x41, 0xFA, 0x62, 0xB9, 0x0D,
|
||||
+ 0xDC, 0x08, 0x62, 0xEC, 0x00, 0xAB, 0xB0, 0xF7, 0x79, 0x48,
|
||||
+ 0x75, 0x22, 0x85, 0xCC, 0x67, 0x3C, 0xEA, 0x09, 0x32, 0xAC,
|
||||
+ 0x30, 0xED, 0x1E, 0x67, 0xDC, 0x74, 0xF8, 0xD9, 0xC3, 0xD0,
|
||||
+ 0xA0, 0x60, 0x4D, 0xCE, 0x52, 0xBC, 0xA3, 0xE5, 0x18, 0x7B,
|
||||
+ 0x0B, 0xC8, 0xCE, 0x70, 0xA2, 0xC8, 0x21, 0xCA, 0xCE, 0xA5,
|
||||
+ 0xD4, 0xCB, 0x85, 0xFC, 0xC7, 0x07, 0x5C, 0x05, 0x87, 0xFC,
|
||||
+ 0x2F, 0x67, 0x4D, 0x2D, 0x4F, 0xA4, 0xEE, 0x63, 0x98, 0x49,
|
||||
+ 0xE4, 0x2E, 0xD7, 0x3F, 0x7D, 0x69, 0x68, 0x0A, 0xA2, 0x3E,
|
||||
+ 0x5A, 0x04, 0xD4, 0xDD, 0xBB, 0xC7, 0xB4, 0x34, 0xB7, 0x21,
|
||||
+ 0xD3, 0xAC, 0x99, 0xD7, 0x87, 0x45, 0x5E, 0x18, 0x68, 0x16,
|
||||
+ 0x3A, 0xAF, 0xE2, 0x04, 0x57, 0xB8, 0x6A, 0xB8, 0x2F, 0x75,
|
||||
+ 0xD5, 0x79, 0x96, 0x60, 0x8D, 0xD1, 0xCC, 0xD1, 0x33, 0x85,
|
||||
+ 0x53, 0x88, 0x87, 0x34, 0xA6, 0x4B, 0x49, 0x24, 0x53, 0xD6,
|
||||
+ 0xF1, 0x1E, 0x4E, 0x98, 0x4D, 0x6B, 0x44, 0x31, 0x94, 0xFF,
|
||||
+ 0x46, 0xC2, 0x38, 0x2E, 0xEA, 0xBB
|
||||
+ };
|
||||
+ static unsigned char dhg_2048[] = {
|
||||
+ 0x05
|
||||
+ };
|
||||
+ DH *dh = DH_new();
|
||||
+ BIGNUM *dhp_bn, *dhg_bn;
|
||||
+
|
||||
+ if (dh == NULL)
|
||||
+ return NULL;
|
||||
+ dhp_bn = BN_bin2bn(dhp_2048, sizeof (dhp_2048), NULL);
|
||||
+ dhg_bn = BN_bin2bn(dhg_2048, sizeof (dhg_2048), NULL);
|
||||
+ if (dhp_bn == NULL || dhg_bn == NULL
|
||||
+ || !DH_set0_pqg(dh, dhp_bn, NULL, dhg_bn)) {
|
||||
+ DH_free(dh);
|
||||
+ BN_free(dhp_bn);
|
||||
+ BN_free(dhg_bn);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ return dh;
|
||||
+}
|
||||
diff --git a/svc.c b/svc.c
|
||||
index 1341397..758dfbd 100644
|
||||
--- a/svc.c
|
||||
+++ b/svc.c
|
||||
@@ -1512,6 +1512,39 @@ do_RSAgen(void)
|
||||
return;
|
||||
}
|
||||
|
||||
+
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||
+static inline int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
|
||||
+{
|
||||
+ /* If the fields p and g in d are NULL, the corresponding input
|
||||
+ * parameters MUST be non-NULL. q may remain NULL.
|
||||
+ */
|
||||
+ if ((dh->p == NULL && p == NULL)
|
||||
+ || (dh->g == NULL && g == NULL))
|
||||
+ return 0;
|
||||
+
|
||||
+ if (p != NULL) {
|
||||
+ BN_free(dh->p);
|
||||
+ dh->p = p;
|
||||
+ }
|
||||
+ if (q != NULL) {
|
||||
+ BN_free(dh->q);
|
||||
+ dh->q = q;
|
||||
+ }
|
||||
+ if (g != NULL) {
|
||||
+ BN_free(dh->g);
|
||||
+ dh->g = g;
|
||||
+ }
|
||||
+
|
||||
+ if (q != NULL) {
|
||||
+ dh->length = BN_num_bits(q);
|
||||
+ }
|
||||
+
|
||||
+ return 1;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
#include "dh512.h"
|
||||
|
||||
#if DH_LEN == 1024
|
||||
@@ -0,0 +1,98 @@
|
||||
From 4e201b75928ff7d4894cd30ab0f5f67b9cd95f5c Mon Sep 17 00:00:00 2001
|
||||
From: Steve Dickson <steved@redhat.com>
|
||||
Date: Thu, 18 Jan 2018 17:33:56 +0000
|
||||
Subject: [PATCH] rpcbproc_callit_com: Stop freeing a static pointer
|
||||
|
||||
commit 7ea36ee introduced a svc_freeargs() call
|
||||
that ended up freeing static pointer.
|
||||
|
||||
It turns out the allocations for the rmt_args
|
||||
is not necessary . The xdr routines (xdr_bytes) will
|
||||
handle the memory management and the largest
|
||||
possible message size is UDPMSGSIZE (due to UDP only)
|
||||
which is smaller than RPC_BUF_MAX
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
(cherry picked from commit 7c7590ad536c0e24bef790cb1e65702fc54db566)
|
||||
Signed-off-by: Ed Blake <ed.blake@sondrel.com>
|
||||
---
|
||||
src/rpcb_svc_com.c | 39 ++++++---------------------------------
|
||||
1 file changed, 6 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
|
||||
index 0432b6f..64f1104 100644
|
||||
--- a/src/rpcb_svc_com.c
|
||||
+++ b/src/rpcb_svc_com.c
|
||||
@@ -616,9 +616,9 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
struct netconfig *nconf;
|
||||
struct netbuf *caller;
|
||||
struct r_rmtcall_args a;
|
||||
- char *buf_alloc = NULL, *outbufp;
|
||||
+ char *outbufp;
|
||||
char *outbuf_alloc = NULL;
|
||||
- char buf[RPC_BUF_MAX], outbuf[RPC_BUF_MAX];
|
||||
+ char outbuf[RPC_BUF_MAX];
|
||||
struct netbuf *na = (struct netbuf *) NULL;
|
||||
struct rpc_msg call_msg;
|
||||
int outlen;
|
||||
@@ -639,36 +639,10 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
}
|
||||
if (si.si_socktype != SOCK_DGRAM)
|
||||
return; /* Only datagram type accepted */
|
||||
- sendsz = __rpc_get_t_size(si.si_af, si.si_proto, UDPMSGSIZE);
|
||||
- if (sendsz == 0) { /* data transfer not supported */
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- /*
|
||||
- * Should be multiple of 4 for XDR.
|
||||
- */
|
||||
- sendsz = ((sendsz + 3) / 4) * 4;
|
||||
- if (sendsz > RPC_BUF_MAX) {
|
||||
-#ifdef notyet
|
||||
- buf_alloc = alloca(sendsz); /* not in IDR2? */
|
||||
-#else
|
||||
- buf_alloc = malloc(sendsz);
|
||||
-#endif /* notyet */
|
||||
- if (buf_alloc == NULL) {
|
||||
- if (debugging)
|
||||
- xlog(LOG_DEBUG,
|
||||
- "rpcbproc_callit_com: No Memory!\n");
|
||||
- if (reply_type == RPCBPROC_INDIRECT)
|
||||
- svcerr_systemerr(transp);
|
||||
- return;
|
||||
- }
|
||||
- a.rmt_args.args = buf_alloc;
|
||||
- } else {
|
||||
- a.rmt_args.args = buf;
|
||||
- }
|
||||
+ sendsz = UDPMSGSIZE;
|
||||
|
||||
call_msg.rm_xid = 0; /* For error checking purposes */
|
||||
+ memset(&a, 0, sizeof(a)); /* Zero out the input buffer */
|
||||
if (!svc_getargs(transp, (xdrproc_t) xdr_rmtcall_args, (char *) &a)) {
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_decode(transp);
|
||||
@@ -708,7 +682,8 @@ rpcbproc_callit_com(struct svc_req *rqstp, SVCXPRT *transp,
|
||||
if (rbl == (rpcblist_ptr)NULL) {
|
||||
#ifdef RPCBIND_DEBUG
|
||||
if (debugging)
|
||||
- xlog(LOG_DEBUG, "not found\n");
|
||||
+ xlog(LOG_DEBUG, "prog %lu vers %lu: not found\n",
|
||||
+ a.rmt_prog, a.rmt_vers);
|
||||
#endif
|
||||
if (reply_type == RPCBPROC_INDIRECT)
|
||||
svcerr_noprog(transp);
|
||||
@@ -941,8 +916,6 @@ out:
|
||||
}
|
||||
if (local_uaddr)
|
||||
free(local_uaddr);
|
||||
- if (buf_alloc)
|
||||
- free(buf_alloc);
|
||||
if (outbuf_alloc)
|
||||
free(outbuf_alloc);
|
||||
if (na) {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From d3f1f55e50e3c436a2ea91d60da84c3a94e6c53f Mon Sep 17 00:00:00 2001
|
||||
From: Steve Dickson <steved@redhat.com>
|
||||
Date: Thu, 18 Jan 2018 17:41:49 +0000
|
||||
Subject: [PATCH] pmapproc_dump: Fixed typo in memory leak patch
|
||||
|
||||
commit 7ea36eee introduce a typo that caused
|
||||
NIS (aka ypbind) to fail.
|
||||
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
(cherry picked from commit c49a7ea639eb700823e174fd605bbbe183e229aa)
|
||||
Signed-off-by: Ed Blake <ed.blake@sondrel.com>
|
||||
---
|
||||
src/pmap_svc.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pmap_svc.c b/src/pmap_svc.c
|
||||
index bb57b05..ffca7df 100644
|
||||
--- a/src/pmap_svc.c
|
||||
+++ b/src/pmap_svc.c
|
||||
@@ -384,7 +384,7 @@ pmapproc_dump(struct svc_req *rqstp /*__unused*/, SVCXPRT *xprt)
|
||||
}
|
||||
|
||||
done:
|
||||
- if (!svc_freeargs(xprt, (xdrproc_t) xdr_pmap, (char *)NULL)) {
|
||||
+ if (!svc_freeargs(xprt, (xdrproc_t) xdr_void, (char *)NULL)) {
|
||||
if (debugging) {
|
||||
(void) xlog(LOG_DEBUG, "unable to free arguments\n");
|
||||
if (doabort) {
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -44,4 +44,7 @@ define HOST_TAR_EXTRACT_CMDS
|
||||
mv $(@D)/tar-$(TAR_VERSION)/* $(@D)
|
||||
rmdir $(@D)/tar-$(TAR_VERSION)
|
||||
endef
|
||||
|
||||
HOST_TAR_CONF_OPTS = --without-selinux
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 c80dbf35e7401f4c122ff25cc2f6b5db496607782fb4583cee8663a2763f4472 ti_cgt_pru_2.1.4_linux_installer_x86.bin
|
||||
sha256 7dc37fd689d1d506bf410d2a00af658b93a58d4bc10ac32c2210129dab617377 ti_cgt_pru_2.2.1_linux_installer_x86.bin
|
||||
sha256 eb646f4f8b14351110992b40ba24d12803bcc150a76e7298705f51088b0a09cc PRU_Code_Generation_Tools_2.2.x_manifest.html
|
||||
sha256 6b98f9262abd1ae9a3731e6feee02a56b6e290542dea119eeeeaf88bf802aabc pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
TI_CGT_PRU_VERSION = 2.1.4
|
||||
TI_CGT_PRU_VERSION = 2.2.1
|
||||
TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin
|
||||
TI_CGT_PRU_SITE = http://downloads.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION)
|
||||
TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \
|
||||
BSL-1.0 (compiler), BSD-2-Clause, BSD-3-Clause, MIT, AFL-3.0, Hewlett-Packard (PRU library)
|
||||
TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.1.x_manifest.html \
|
||||
PRU_CodeGen_Library_2.1_0222433C-30C1-442d-B5C6-2073BD97F80F.spdx.tag
|
||||
TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.2.x_manifest.html \
|
||||
pru_rts_2_2_0_82167478-F8C9-49b2-82BD-12F8550770F9.spdx
|
||||
|
||||
define HOST_TI_CGT_PRU_EXTRACT_CMDS
|
||||
chmod +x $(DL_DIR)/$(TI_CGT_PRU_SOURCE)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.18.4.tar.xz.sums
|
||||
md5 c4686971eac2760bab685e21ac8849be webkitgtk-2.18.4.tar.xz
|
||||
sha1 709616b445158dc3163a64bb59e95aadbe58949c webkitgtk-2.18.4.tar.xz
|
||||
sha256 87b6bb9a6065b949ecbe6191313c43e57ad28efdf1f2b5e763405093520632b8 webkitgtk-2.18.4.tar.xz
|
||||
# From https://webkitgtk.org/releases/webkitgtk-2.18.5.tar.xz.sums
|
||||
md5 af18c2cfa00cadfd0b4d8db21cab011d webkitgtk-2.18.5.tar.xz
|
||||
sha1 5f36db464f6b7bbe6a57e55bc9bb172f87a4c398 webkitgtk-2.18.5.tar.xz
|
||||
sha256 0c6d80cc7eb5d32f8063041fa11a1a6f17a29765c2f69c6bc862cd47c2d539b8 webkitgtk-2.18.5.tar.xz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
WEBKITGTK_VERSION = 2.18.4
|
||||
WEBKITGTK_VERSION = 2.18.5
|
||||
WEBKITGTK_SITE = http://www.webkitgtk.org/releases
|
||||
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
|
||||
WEBKITGTK_INSTALL_STAGING = YES
|
||||
|
||||
@@ -204,7 +204,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
|
||||
MD5Transform(ctx->buf, (uint32 *) ctx->in);
|
||||
byteReverse((unsigned char *) ctx->buf, 4);
|
||||
memcpy(digest, ctx->buf, 16);
|
||||
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
|
||||
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
|
||||
}
|
||||
|
||||
/* The four core functions - F1 is optimized somewhat */
|
||||
|
||||
@@ -16,4 +16,8 @@ XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
|
||||
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
|
||||
XLIB_LIBXPM_CONF_ENV = ac_cv_search_gettext=no
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -56,6 +56,7 @@ XEN_DEPENDENCIES += argp-standalone
|
||||
endif
|
||||
XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools
|
||||
XEN_MAKE_OPTS += dist-tools
|
||||
XEN_CONF_OPTS += --with-extra-qemuu-configure-args="--disable-sdl"
|
||||
|
||||
define XEN_INSTALL_INIT_SYSV
|
||||
mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons
|
||||
|
||||
@@ -220,7 +220,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
|
||||
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
||||
|
||||
HOSTLOADLIBES_nconf = $(shell \
|
||||
pkg-config --libs menu panel ncurses 2>/dev/null \
|
||||
pkg-config --libs menuw panelw ncursesw 2>/dev/null \
|
||||
|| pkg-config --libs menu panel ncurses 2>/dev/null \
|
||||
|| echo "-lmenu -lpanel -lncurses" )
|
||||
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
|
||||
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
From 7285996aa0006d671bb01f0d35991d254b2b2b01 Mon Sep 17 00:00:00 2001
|
||||
From: Brian Norris <computersforpeace@gmail.com>
|
||||
Date: Wed, 4 Jun 2014 00:52:31 -0700
|
||||
Subject: kconfig: nconfig: fix multi-byte UTF handling
|
||||
|
||||
Currently, Kconfig descriptions that use multi-byte UTF-8 characters
|
||||
(such as MTD_NAND_CAFE) will have their menu entries dropped from the
|
||||
'make nconfig' ncurses menu, and all subsequent entries in the same
|
||||
window will be omitted. This seems to be due to the ncurses 'menu'
|
||||
library, which does not traditionally handle UTF-8 >8-bit characters
|
||||
properly.
|
||||
|
||||
The ncursesw library ('w' is for "wide") is written to handle these
|
||||
UTF-8 characters, and is practically a drop-in replacement at the source
|
||||
level. Use it by default, if available.
|
||||
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067
|
||||
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
||||
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Cc: Martin Walch <walch.martin@web.de>
|
||||
Acked-by: Sam Ravnborg <sam@ravnborg.org>
|
||||
Signed-off-by: Michal Marek <mmarek@suse.cz>
|
||||
---
|
||||
scripts/kconfig/Makefile | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
(limited to 'scripts/kconfig/Makefile')
|
||||
|
||||
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
|
||||
index e7bf38e..c059385 100644
|
||||
--- a/scripts/kconfig/Makefile
|
||||
+++ b/scripts/kconfig/Makefile
|
||||
@@ -191,7 +191,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
|
||||
HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
|
||||
|
||||
HOSTLOADLIBES_nconf = $(shell \
|
||||
- pkg-config --libs menu panel ncurses 2>/dev/null \
|
||||
+ pkg-config --libs menuw panelw ncursesw 2>/dev/null \
|
||||
+ || pkg-config --libs menu panel ncurses 2>/dev/null \
|
||||
|| echo "-lmenu -lpanel -lncurses" )
|
||||
$(obj)/qconf.o: $(obj)/.tmp_qtcheck
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@@ -7,3 +7,4 @@
|
||||
15-fix-qconf-moc-rule.patch
|
||||
16-fix-space-to-de-select-options.patch
|
||||
17-kconfig-lxdialog-get-ncurses-CFLAGS-with-pkg-config.patch
|
||||
18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch
|
||||
|
||||
@@ -184,7 +184,7 @@ def pkg_pie_time_per_package(data, output):
|
||||
labels = []
|
||||
values = []
|
||||
other_value = 0
|
||||
for p in data:
|
||||
for p in sorted(data, key=lambda p: p.get_duration()):
|
||||
if p.get_duration() < (total * 0.01):
|
||||
other_value += p.get_duration()
|
||||
else:
|
||||
|
||||
@@ -127,7 +127,7 @@ def draw_graph(pkgsize, outputf):
|
||||
labels = []
|
||||
values = []
|
||||
other_value = 0
|
||||
for (p, sz) in pkgsize.items():
|
||||
for (p, sz) in sorted(pkgsize.items(), key=lambda x: x[1]):
|
||||
if sz < (total * 0.01):
|
||||
other_value += sz
|
||||
else:
|
||||
|
||||
@@ -355,12 +355,16 @@ config BR2_TARGET_GENERIC_GETTY_BAUDRATE
|
||||
config BR2_TARGET_GENERIC_GETTY_TERM
|
||||
string "TERM environment variable"
|
||||
default "vt100"
|
||||
# currently observed only by busybox and sysvinit
|
||||
depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV
|
||||
help
|
||||
Specify a TERM type.
|
||||
|
||||
config BR2_TARGET_GENERIC_GETTY_OPTIONS
|
||||
string "other options to pass to getty"
|
||||
default ""
|
||||
# currently observed only by busybox and sysvinit
|
||||
depends on BR2_INIT_BUSYBOX || BR2_INIT_SYSV
|
||||
help
|
||||
Any other flags you want to pass to getty,
|
||||
Refer to getty --help for details.
|
||||
|
||||
@@ -22,6 +22,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
default y if BR2_ARM_CPU_ARMV4
|
||||
default y if BR2_ARM_CPU_ARMV5
|
||||
default y if BR2_sparc_v8
|
||||
default y if BR2_m68k_cf5208
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
|
||||
|
||||
config BR2_TOOLCHAIN_HAS_NATIVE_RPC
|
||||
|
||||
@@ -108,10 +108,10 @@ endif
|
||||
# Definitions of the list of libraries that should be copied to the target.
|
||||
#
|
||||
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.*
|
||||
TOOLCHAIN_EXTERNAL_LIBS += ld*.so* libgcc_s.so.* libatomic.so.*
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libatomic.so.* libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libc.so.* libcrypt.so.* libdl.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
TOOLCHAIN_EXTERNAL_LIBS += libpthread.so.*
|
||||
ifneq ($(BR2_PACKAGE_GDB)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)
|
||||
|
||||
Reference in New Issue
Block a user