Reinhard Russinger 2 年之前
父節點
當前提交
e55a1d2501

+ 18 - 11
board/PSG/iot2050/iot2050.cfg

@@ -2,7 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/arm64 5.10.162 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2022.11-1462-gd2bbd91-dirty) 12.2.0"
+CONFIG_CC_VERSION_TEXT="aarch64-buildroot-linux-gnu-gcc.br_real (Buildroot 2023.02-rc2-4-g14def5c) 12.2.0"
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=120200
 CONFIG_LD_VERSION=238000000
@@ -2444,7 +2444,7 @@ CONFIG_USB_ARMLINUX=y
 CONFIG_USB_NET_ZAURUS=m
 # CONFIG_USB_NET_CX82310_ETH is not set
 # CONFIG_USB_NET_KALMIA is not set
-CONFIG_USB_NET_QMI_WWAN=m
+# CONFIG_USB_NET_QMI_WWAN is not set
 # CONFIG_USB_HSO is not set
 # CONFIG_USB_NET_INT51X1 is not set
 # CONFIG_USB_IPHETH is not set
@@ -6876,7 +6876,7 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_TRUSTED_KEYS is not set
 # CONFIG_ENCRYPTED_KEYS is not set
-# CONFIG_KEY_DH_OPERATIONS is not set
+CONFIG_KEY_DH_OPERATIONS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -6929,7 +6929,7 @@ CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_AEAD=y
 CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_SKCIPHER=m
+CONFIG_CRYPTO_SKCIPHER=y
 CONFIG_CRYPTO_SKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
@@ -6939,7 +6939,7 @@ CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
-CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_KPP=y
 CONFIG_CRYPTO_ACOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
@@ -6957,7 +6957,7 @@ CONFIG_CRYPTO_TEST=m
 # Public-key cryptography
 #
 CONFIG_CRYPTO_RSA=y
-# CONFIG_CRYPTO_DH is not set
+CONFIG_CRYPTO_DH=y
 CONFIG_CRYPTO_ECC=m
 CONFIG_CRYPTO_ECDH=m
 # CONFIG_CRYPTO_ECRDSA is not set
@@ -7030,16 +7030,21 @@ CONFIG_CRYPTO_SHA512=m
 #
 CONFIG_CRYPTO_AES=y
 # CONFIG_CRYPTO_AES_TI is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_DES is not set
+CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_CHACHA20 is not set
+# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SERPENT is not set
 # CONFIG_CRYPTO_SM4 is not set
+# CONFIG_CRYPTO_TEA is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 
 #
@@ -7062,10 +7067,12 @@ CONFIG_CRYPTO_DRBG_HMAC=y
 # CONFIG_CRYPTO_DRBG_CTR is not set
 CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
 # CONFIG_CRYPTO_USER_API_RNG is not set
 # CONFIG_CRYPTO_USER_API_AEAD is not set
+CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 CONFIG_CRYPTO_HASH_INFO=y
 CONFIG_CRYPTO_HW=y
 # CONFIG_CRYPTO_DEV_ATMEL_ECC is not set
@@ -7082,7 +7089,7 @@ CONFIG_CRYPTO_HW=y
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
-# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=y
 CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
@@ -7129,7 +7136,7 @@ CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
 CONFIG_CRYPTO_LIB_CHACHA=m
 CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
 CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_DES=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
 CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
 CONFIG_CRYPTO_LIB_POLY1305=m

+ 1 - 0
board/PSG/iot2050/rootfs/etc/modprobe.d/local-dontload.conf

@@ -0,0 +1 @@
+blacklist cdc_ether

+ 2 - 2
board/PSG/iot2050/rootfs/etc/ppp/ip-down.d/psg-dns

@@ -18,10 +18,10 @@ if [ -e "$WRKPATH/resolv.conf" ]; then
     readarray -t DNSSERVERS < <(cat $WRKPATH/resolv.conf)
 
     for DNS in "${DNSSERVERS[@]}"; do
-        if [[ ! -z $(/bin/grep "$DNS" "$DESTFILE") ]]; then
+        if ! /bin/grep "$DNS" "$DESTFILE"; then
             /bin/sed --follow-symlinks -i "/$DNS/d" $DESTFILE
         fi
     done
 
-    rm $WRKPATH/resolv.conf
+    rm /tmp/resolv_pppd.conf
 fi    

+ 3 - 3
board/PSG/iot2050/rootfs/etc/ppp/ip-up.d/psg-dns

@@ -18,9 +18,9 @@ if [ -e "$WRKPATH/resolv.conf" ]; then
     readarray -t DNSSERVERS < <(cat $WRKPATH/resolv.conf)
 
     for DNS in "${DNSSERVERS[@]}"; do
-        if [[ -z $(/bin/grep "$DNS" "$DESTFILE") ]]; then
-            /bin/sed --follow-symlinks -i "1 s/^/$DNS \# $1\n/" $DESTFILE
-    #        echo "$DNS" #>> $DESTFILE
+        if ! /bin/grep "$DNS" "$DESTFILE"; then
+           echo "$DNS # $1" >> $DESTFILE
+#           /bin/sed --follow-symlinks -i "1 s/^/$DNS \# $1\n/" $DESTFILE
         fi
     done
 fi