Browse Source

Merge branch 'Snap7' of https://gogs.psg-bgh.de/PSG/IOT2000_BuildRoot into Snap7

Reinhard Russinger 3 years ago
parent
commit
09db778add
2 changed files with 3 additions and 8 deletions
  1. 1 0
      MakeBuildrootEnv.sh
  2. 2 8
      configs/iot2000_defconfig

+ 1 - 0
MakeBuildrootEnv.sh

@@ -6,6 +6,7 @@ git clone git://git.buildroot.net/buildroot
 cd buildroot
 ###git checkout 63a20d5dfebe83e2b2bd683dc78ebdf787dff100 -b psgwrk
 git checkout c4d26992560875930866a627cc936da2f938401b -b psgwrk
+#git checkout 2021.8.1 -b psgwrk
 #==== Patches
 for i in ../PSG/patches/*.patch
 do

+ 2 - 8
configs/iot2000_defconfig

@@ -9,7 +9,6 @@ BR2_GCC_ENABLE_OPENMP=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
 BR2_PACKAGE_HOST_GDB_PYTHON=y
-BR2_GDB_VERSION_7_12=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_TARGET_GENERIC_HOSTNAME="PSG_iot200"
 BR2_TARGET_GENERIC_ISSUE="Welcome to PSG iot2000"
@@ -136,7 +135,6 @@ BR2_PACKAGE_LIBSODIUM=y
 BR2_PACKAGE_BERKELEYDB=y
 BR2_PACKAGE_MARIADB=y
 BR2_PACKAGE_MARIADB_SERVER=y
-BR2_PACKAGE_SQLITE_STAT3=y
 BR2_PACKAGE_SQLITE_ENABLE_FTS3=y
 BR2_PACKAGE_SQLITE_ENABLE_JSON1=y
 BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y
@@ -151,7 +149,7 @@ BR2_PACKAGE_JSON_C=y
 BR2_PACKAGE_LIBXSLT=y
 BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_YAJL=y
-BR2_PACKAGE_CURL=y
+BR2_PACKAGE_LIBCURL_CURL=y
 BR2_PACKAGE_LIBCURL_VERBOSE=y
 BR2_PACKAGE_LIBMICROHTTPD=y
 BR2_PACKAGE_LIBMICROHTTPD_SSL=y
@@ -171,7 +169,6 @@ BR2_PACKAGE_BOOST_MPI=y
 BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
 BR2_PACKAGE_BOOST_RANDOM=y
 BR2_PACKAGE_BOOST_SERIALIZATION=y
-BR2_PACKAGE_BOOST_SIGNALS=y
 BR2_PACKAGE_BOOST_TIMER=y
 BR2_PACKAGE_BOOST_TYPE_ERASURE=y
 BR2_PACKAGE_BOOST_WAVE=y
@@ -189,7 +186,6 @@ BR2_PACKAGE_DNSMASQ=y
 # BR2_PACKAGE_DNSMASQ_TFTP is not set
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_HOSTAPD=y
-BR2_PACKAGE_HOSTAPD_DRIVER_RTW=y
 BR2_PACKAGE_HOSTAPD_EAP=y
 BR2_PACKAGE_HOSTAPD_WPS=y
 BR2_PACKAGE_HTTPING=y
@@ -216,15 +212,13 @@ BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
 BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
 BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y
 BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
-BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
 BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
 BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
 BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
 BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
 BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
-BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
-BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
+BR2_PACKAGE_WPA_SUPPLICANT_DBUS=y
 BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
 BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_PINENTRY=y