domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: don't set ARGV and ARGC

Browse Source 
Those are not used by any image check function anymore.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 3f4c785a6b)
This commit is contained in:
Rafał Miłecki
2019-07-14 19:00:00 +02:00
committed by Jo-Philipp Wich
parent adec8aa291
commit 6ac62c4b6c
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=203 PKG_RELEASE:=204
PKG_FLAGS:=nonshared PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

3
package/base-files/files/lib/upgrade/stage2
View File

@@ -6,9 +6,6 @@
export IMAGE="$1" export IMAGE="$1"
COMMAND="$2" COMMAND="$2"
export ARGV="$IMAGE"
export ARGC=1
export SAVE_CONFIG=1 export SAVE_CONFIG=1
export SAVE_PARTITIONS=1 export SAVE_PARTITIONS=1

3
package/base-files/files/sbin/sysupgrade
View File

@@ -316,9 +316,6 @@ case "$IMAGE" in
;; ;;
esac esac
export ARGV="$IMAGE"
export ARGC=1
for check in $sysupgrade_image_check; do for check in $sysupgrade_image_check; do
( $check "$IMAGE" ) || { ( $check "$IMAGE" ) || {
if [ $FORCE -eq 1 ]; then if [ $FORCE -eq 1 ]; then