dsl-ax82u: Merged GPL 386_41700

gnuton · Feb 4, 2021 · aa3d70a · aa3d70a
1 parent 63d4185
commit aa3d70a
Show file tree

Hide file tree

Showing 53 changed files with 2 additions and 2 deletions.
diff --git a/release/src-rt-5.02axhnd.675x/hostTools/prebuilt/DSL-AX82U/addvtoken b/release/src-rt-5.02axhnd.675x/hostTools/prebuilt/DSL-AX82U/addvtoken
diff --git a/release/src/router/ahs/prebuild/DSL-AX82U/ahs b/release/src/router/ahs/prebuild/DSL-AX82U/ahs
diff --git a/release/src/router/amas-utils/prebuild/DSL-AX82U/libamas-utils.so b/release/src/router/amas-utils/prebuild/DSL-AX82U/libamas-utils.so
diff --git a/release/src/router/asd/prebuild/DSL-AX82U/asd b/release/src/router/asd/prebuild/DSL-AX82U/asd
diff --git a/release/src/router/bwdpi_source/asus/prebuild/DSL-AX82U/libbwdpi.so b/release/src/router/bwdpi_source/asus/prebuild/DSL-AX82U/libbwdpi.so
diff --git a/release/src/router/bwdpi_source/asus_sql/prebuild/DSL-AX82U/libbwdpi_sql.so b/release/src/router/bwdpi_source/asus_sql/prebuild/DSL-AX82U/libbwdpi_sql.so
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_client b/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_client
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_reportstatus b/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_reportstatus
diff --git a/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_server b/release/src/router/cfg_mnt/prebuild/DSL-AX82U/cfg_server
diff --git a/release/src/router/httpd/prebuild/DSL-AX82U/web_hook.o b/release/src/router/httpd/prebuild/DSL-AX82U/web_hook.o
diff --git a/release/src/router/libletsencrypt/prebuild/DSL-AX82U/libletsencrypt.so b/release/src/router/libletsencrypt/prebuild/DSL-AX82U/libletsencrypt.so
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas-ssd-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/amas-ssd-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_bhctrl.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_bhctrl.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_ipc.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_ipc.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_lanctrl.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_lanctrl.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_lib.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_lib.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_misc.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_misc.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_ssd.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_ssd.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_status.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_status.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/amas_wlcconnect.o b/release/src/router/rc/prebuild/DSL-AX82U/amas_wlcconnect.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/ate-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/ate-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/ate.o b/release/src/router/rc/prebuild/DSL-AX82U/ate.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_check.o b/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_check.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_db_10.o b/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_db_10.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_wred_alive.o b/release/src/router/rc/prebuild/DSL-AX82U/bwdpi_wred_alive.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/cfe.o b/release/src/router/rc/prebuild/DSL-AX82U/cfe.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/conn_diag-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/conn_diag-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/conn_diag.o b/release/src/router/rc/prebuild/DSL-AX82U/conn_diag.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/dhcpc_vc_query.o b/release/src/router/rc/prebuild/DSL-AX82U/dhcpc_vc_query.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/dsl-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/dsl-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/dsl_diag.o b/release/src/router/rc/prebuild/DSL-AX82U/dsl_diag.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/dsl_fb.o b/release/src/router/rc/prebuild/DSL-AX82U/dsl_fb.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/frs_service.o b/release/src/router/rc/prebuild/DSL-AX82U/frs_service.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/hostapd_config.o b/release/src/router/rc/prebuild/DSL-AX82U/hostapd_config.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/init-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/init-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/ledg.o b/release/src/router/rc/prebuild/DSL-AX82U/ledg.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/mswan-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/mswan-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/nt_mail.o b/release/src/router/rc/prebuild/DSL-AX82U/nt_mail.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/obd.o b/release/src/router/rc/prebuild/DSL-AX82U/obd.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/obd_eth.o b/release/src/router/rc/prebuild/DSL-AX82U/obd_eth.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/obd_monitor.o b/release/src/router/rc/prebuild/DSL-AX82U/obd_monitor.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/private.o b/release/src/router/rc/prebuild/DSL-AX82U/private.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/psta_monitor.o b/release/src/router/rc/prebuild/DSL-AX82U/psta_monitor.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/roamast-broadcom.o b/release/src/router/rc/prebuild/DSL-AX82U/roamast-broadcom.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/roamast.o b/release/src/router/rc/prebuild/DSL-AX82U/roamast.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/tcode_brcm.o b/release/src/router/rc/prebuild/DSL-AX82U/tcode_brcm.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/tr069.o b/release/src/router/rc/prebuild/DSL-AX82U/tr069.o
diff --git a/release/src/router/rc/prebuild/DSL-AX82U/wps_pbcd.o b/release/src/router/rc/prebuild/DSL-AX82U/wps_pbcd.o
diff --git a/release/src/router/shared/prebuild/DSL-AX82U/private.o b/release/src/router/shared/prebuild/DSL-AX82U/private.o
diff --git a/release/src/router/shared/prebuild/DSL-AX82U/tcode.o b/release/src/router/shared/prebuild/DSL-AX82U/tcode.o
diff --git a/release/src/router/sw-hw-auth/prebuild/DSL-AX82U/hw_auth.o b/release/src/router/sw-hw-auth/prebuild/DSL-AX82U/hw_auth.o
diff --git a/tools/add-prebuilds-to-git b/tools/add-prebuilds-to-git
@@ -5,7 +5,7 @@ set -e
 # Run this script after having reviewed the merge
 
 BUILD_NAME=$1
-
+REPO=.
 echo "*** Adding files to GIT after a GPL Merge..."
 if [ "$BUILD_NAME" == "DSL-AC68U" ]
 then
@@ -87,7 +87,7 @@ then
     git add -f $REPO/release/src/router/eventd/prebuilt/$BUILD_NAME/
 
     git add -f $REPO/release/src/router/bsd/prebuilt/$BUILD_NAME/
-    git add -f $REPO/release/src/router/dhd/prebuilt/$BUILD_NAME/
+    #git add -f $REPO/release/src/router/dhd/prebuilt/$BUILD_NAME/
 else
     echo "Unrecognized BUILD_NAME!"
     exit