Skip to content
Permalink
Browse files

more syncs with owrt 2020.01

  • Loading branch information
zyxmon committed Jan 8, 2020
1 parent 618942a commit cbe059dbccfac2728d166ad2ccc0bb35f2f426ca
Showing with 32 additions and 27 deletions.
  1. +3 −8 LastSync.txt
  2. +4 −0 Makefile
  3. +23 −18 configs/armv7-3.2.config
  4. +2 −1 rules.mk
@@ -1,8 +1,3 @@
commit 2e2fe82d1e74794a2fe78861ed43627798d5ae4b
Author: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Fri Sep 20 07:50:47 2019 +0200

brcm2708: fix Hifiberry DAC+DSP package definition

Fixes: ce536ae ("brcm2708: add support for Hifiberry DAC+DSP")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
commit 8fc25d8664841ff1cd0f3082b4c404cab76d6341
Author: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Sun Jan 5 23:19:45 2020 +0100
@@ -18,6 +18,7 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the Entware dir

world:

DISTRO_PKG_CONFIG:=$(shell which -a pkg-config | grep -E '\/usr' | head -n 1)
export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)

ifneq ($(OPENWRT_BUILD),1)
@@ -99,6 +100,9 @@ diffconfig: FORCE
mkdir -p $(BIN_DIR)
$(SCRIPT_DIR)/diffconfig.sh > $(BIN_DIR)/config.buildinfo

buildinfo: FORCE
$(_SINGLE)$(SUBMAKE) -r diffconfig buildversion feedsversion

headers: FORCE
tar -czf $(BIN_DIR)/include.tar.gz -C $(STAGING_DIR)/opt/include .

@@ -2430,6 +2430,7 @@ CONFIG_PACKAGE_valgrind-vgdb=m
# CONFIG_PACKAGE_jose is not set
# CONFIG_PACKAGE_libjose is not set
# CONFIG_PACKAGE_tang is not set
CONFIG_PACKAGE_wireguard-tools=m

#
# Firmware
@@ -3189,9 +3190,11 @@ CONFIG_PACKAGE_python3-email=m
# CONFIG_PACKAGE_python3-flup-src is not set
CONFIG_PACKAGE_python3-gdbm=m
# CONFIG_PACKAGE_python3-gdbm-src is not set
CONFIG_PACKAGE_python3-gevent=m
# CONFIG_PACKAGE_python3-gmpy2 is not set
# CONFIG_PACKAGE_python3-gmpy2-src is not set
# CONFIG_PACKAGE_python3-gnupg is not set
CONFIG_PACKAGE_python3-greenlet=m
# CONFIG_PACKAGE_python3-gunicorn is not set
# CONFIG_PACKAGE_python3-gunicorn-src is not set
# CONFIG_PACKAGE_python3-hyperlink is not set
@@ -3274,6 +3277,7 @@ CONFIG_PACKAGE_python3-pkg-resources=m
# CONFIG_PACKAGE_python3-pkg-resources-src is not set
CONFIG_PACKAGE_python3-ply=m
# CONFIG_PACKAGE_python3-ply-src is not set
CONFIG_PACKAGE_python3-psutil=m
# CONFIG_PACKAGE_python3-py is not set
# CONFIG_PACKAGE_python3-py-src is not set
CONFIG_PACKAGE_python3-pyasn1=m
@@ -3305,6 +3309,7 @@ CONFIG_PACKAGE_python3-pyopenssl=m
# CONFIG_PACKAGE_python3-qrcode-src is not set
# CONFIG_PACKAGE_python3-rcssmin is not set
# CONFIG_PACKAGE_python3-rcssmin-src is not set
CONFIG_PACKAGE_python3-regex=m
CONFIG_PACKAGE_python3-requests=m
# CONFIG_PACKAGE_python3-requests-oauthlib is not set
# CONFIG_PACKAGE_python3-requests-oauthlib-src is not set
@@ -3480,7 +3485,8 @@ CONFIG_PACKAGE_slsh=m
# Compression
#
CONFIG_PACKAGE_libbz2=m
# CONFIG_PACKAGE_liblz4 is not set
CONFIG_PACKAGE_liblz4=m
# CONFIG_LZ4_OPTIMIZE_SPEED is not set
CONFIG_PACKAGE_liblzma=m
CONFIG_PACKAGE_libunrar=m
CONFIG_PACKAGE_libzip-gnutls=m
@@ -4519,6 +4525,7 @@ CONFIG_WOLFSSL_HAS_TLSV13=y
# CONFIG_WOLFSSL_HAS_ECC25519 is not set
CONFIG_WOLFSSL_HAS_NO_HW=y
# CONFIG_WOLFSSL_HAS_AFALG is not set
# CONFIG_WOLFSSL_HAS_DEVCRYPTO_CBC is not set
# CONFIG_WOLFSSL_HAS_DEVCRYPTO_AES is not set
# CONFIG_WOLFSSL_HAS_DEVCRYPTO_FULL is not set

@@ -4741,6 +4748,7 @@ CONFIG_LIBCURL_ZLIB=y
# CONFIG_LIBCURL_UNIX_SOCKETS is not set
# CONFIG_LIBCURL_LIBCURL_OPTION is not set
# CONFIG_LIBCURL_VERBOSE is not set
# CONFIG_PACKAGE_libcxx is not set
CONFIG_PACKAGE_libdaemon=m
CONFIG_PACKAGE_libdaq=m
CONFIG_PACKAGE_libdb47=m
@@ -5023,7 +5031,7 @@ CONFIG_PACKAGE_libtirpc=m
CONFIG_PACKAGE_libtorrent=m
CONFIG_PACKAGE_libubox=m
# CONFIG_PACKAGE_libubox-lua is not set
CONFIG_PACKAGE_libubus=m
# CONFIG_PACKAGE_libubus is not set
# CONFIG_PACKAGE_libubus-lua is not set
# CONFIG_PACKAGE_libuci is not set
# CONFIG_PACKAGE_libuci-lua is not set
@@ -6437,7 +6445,6 @@ CONFIG_PACKAGE_vtun=m
#
CONFIG_VTUN_LZO=y
CONFIG_VTUN_SSL=y
# CONFIG_PACKAGE_wireguard-tools is not set
CONFIG_PACKAGE_xl2tpd=m
CONFIG_PACKAGE_zerotier=m

@@ -6531,17 +6538,14 @@ CONFIG_PACKAGE_lighttpd-mod-userdir=m
CONFIG_PACKAGE_lighttpd-mod-usertrack=m
CONFIG_PACKAGE_lighttpd-mod-webdav=m
CONFIG_PACKAGE_lighttpd-mod-wstunnel=m
# CONFIG_PACKAGE_mini-httpd is not set
# CONFIG_PACKAGE_mini-httpd-htpasswd is not set
# CONFIG_PACKAGE_mini-httpd-openssl is not set
CONFIG_PACKAGE_nginx=m

#
# Configuration
#
CONFIG_NGINX_SSL=y
CONFIG_NGINX_DAV=y
CONFIG_NGINX_UBUS=y
# CONFIG_NGINX_UBUS is not set
CONFIG_NGINX_FLV=y
CONFIG_NGINX_STUB_STATUS=y
CONFIG_NGINX_HTTP_CHARSET=y
@@ -6781,11 +6785,10 @@ CONFIG_PACKAGE_iptraf=m
CONFIG_PACKAGE_iputils-arping=m
CONFIG_PACKAGE_iputils-clockdiff=m
CONFIG_PACKAGE_iputils-ping=m
CONFIG_PACKAGE_iputils-ping6=m
# CONFIG_PING_LEGACY_SYMLINKS is not set
CONFIG_PACKAGE_iputils-tftpd=m
CONFIG_PACKAGE_iputils-tracepath=m
CONFIG_PACKAGE_iputils-tracepath6=m
CONFIG_PACKAGE_iputils-traceroute6=m
# CONFIG_TRACEPATH_LEGACY_SYMLINKS is not set
CONFIG_PACKAGE_ipv6calc=m
CONFIG_PACKAGE_ipv6calc-mini=m
CONFIG_PACKAGE_ipv6log=m
@@ -6948,6 +6951,7 @@ CONFIG_PACKAGE_pppoe-discovery=m
CONFIG_PACKAGE_pppstats=m
# CONFIG_PACKAGE_proxychains-ng is not set
CONFIG_PACKAGE_ps3netsrv=m
CONFIG_PACKAGE_ps3netsrv-mbedtls=m
# CONFIG_PACKAGE_ptunnel-ng is not set
CONFIG_PACKAGE_pvpgn=m
CONFIG_PACKAGE_pyload=m
@@ -7135,6 +7139,12 @@ CONFIG_PACKAGE_ympd=m
# Utilities
#

#
# Backup
#
CONFIG_PACKAGE_rdiff-backup=m
CONFIG_PACKAGE_rsnapshot=m

#
# BigClown
#
@@ -7211,7 +7221,9 @@ CONFIG_PACKAGE_mariadb-server-plugin-wsrep-info=m
CONFIG_PACKAGE_pgsql-cli=m
CONFIG_PACKAGE_pgsql-cli-extra=m
CONFIG_PACKAGE_pgsql-server=m
CONFIG_PACKAGE_rrdcgi=m
CONFIG_PACKAGE_rrdcgi1=m
CONFIG_PACKAGE_rrdtool=m
CONFIG_PACKAGE_rrdtool1=m
CONFIG_PACKAGE_sqlite3-cli=m

@@ -7436,12 +7448,6 @@ CONFIG_PACKAGE_zoneinfo-poles=m
CONFIG_PACKAGE_zoneinfo-simple=m
CONFIG_PACKAGE_zoneinfo-southamerica=m

#
# backup
#
CONFIG_PACKAGE_rdiff-backup=m
CONFIG_PACKAGE_rsnapshot=m

#
# libimobiledevice
#
@@ -7849,6 +7855,7 @@ CONFIG_PACKAGE_memtester=m
# CONFIG_PACKAGE_micrond is not set
CONFIG_PACKAGE_mlocate=m
# CONFIG_PACKAGE_mmc-utils is not set
CONFIG_PACKAGE_more=m
CONFIG_PACKAGE_moreutils=m
CONFIG_PACKAGE_mosh-client=m
CONFIG_PACKAGE_mosh-full=m
@@ -7921,8 +7928,6 @@ CONFIG_PACKAGE_remind=m
CONFIG_PACKAGE_rename=m
# CONFIG_PACKAGE_restic is not set
CONFIG_PACKAGE_rng-tools=m
CONFIG_PACKAGE_rrdcgi=m
CONFIG_PACKAGE_rrdtool=m
# CONFIG_PACKAGE_rtl-ais is not set
CONFIG_PACKAGE_rtl-sdr=m
CONFIG_PACKAGE_rtl_433=m
@@ -71,6 +71,7 @@ TARGET_SUFFIX=$(call qstrip,$(CONFIG_TARGET_SUFFIX))
BUILD_SUFFIX:=$(call qstrip,$(CONFIG_BUILD_SUFFIX))
SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
BUILD_SUBDIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
NPROC:=$(shell sysctl -n hw.ncpu 2>/dev/null || nproc)
export SHELL:=/usr/bin/env bash

IS_PACKAGE_BUILD := $(if $(filter package/%,$(BUILD_SUBDIR)),1)
@@ -159,7 +160,7 @@ TARGET_ROOTFS_DIR?=$(if $(call qstrip,$(CONFIG_TARGET_ROOTFS_DIR)),$(call qstrip
TARGET_DIR:=$(TARGET_ROOTFS_DIR)/root-$(BOARD)
STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
STAGING_DIR_IMAGE:=$(STAGING_DIR)/image
BUILD_LOG_DIR:=$(TOPDIR)/logs
BUILD_LOG_DIR:=$(if $(call qstrip,$(CONFIG_BUILD_LOG_DIR)),$(call qstrip,$(CONFIG_BUILD_LOG_DIR)),$(TOPDIR)/logs)
PKG_INFO_DIR := $(STAGING_DIR)/pkginfo

BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host)

0 comments on commit cbe059d

Please sign in to comment.
You can’t perform that action at this time.