aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2019-07-14 19:00:00 +0200
committerJo-Philipp Wich <jo@mein.io>2019-09-04 13:29:37 +0200
commit6ac62c4b6cae9f92d8d631ad1aca3b822e24901a (patch)
tree603aff0fe2f6a37c8591c60ce5e47009e585a699 /package
parentadec8aa291034e7df5a87960bdfbdf4c6f566fd6 (diff)
downloadupstream-6ac62c4b6cae9f92d8d631ad1aca3b822e24901a.tar.gz
upstream-6ac62c4b6cae9f92d8d631ad1aca3b822e24901a.tar.bz2
upstream-6ac62c4b6cae9f92d8d631ad1aca3b822e24901a.zip
base-files: don't set ARGV and ARGC
Those are not used by any image check function anymore. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 3f4c785a6bbde87296e362c315f10b55c98843e3)
Diffstat (limited to 'package')
-rw-r--r--package/base-files/Makefile2
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage23
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade3
3 files changed, 1 insertions, 7 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 44aef87a20..7c63d3ef44 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
include $(INCLUDE_DIR)/feeds.mk
PKG_NAME:=base-files
-PKG_RELEASE:=203
+PKG_RELEASE:=204
PKG_FLAGS:=nonshared
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 0a11cb2005..fef121f37c 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -6,9 +6,6 @@
export IMAGE="$1"
COMMAND="$2"
-export ARGV="$IMAGE"
-export ARGC=1
-
export SAVE_CONFIG=1
export SAVE_PARTITIONS=1
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 73291262e7..001e644476 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -316,9 +316,6 @@ case "$IMAGE" in
;;
esac
-export ARGV="$IMAGE"
-export ARGC=1
-
for check in $sysupgrade_image_check; do
( $check "$IMAGE" ) || {
if [ $FORCE -eq 1 ]; then