base-files: don't set ARGV and ARGC
authorRafał Miłecki <rafal@milecki.pl>
Sun, 14 Jul 2019 17:00:00 +0000 (19:00 +0200)
committerJo-Philipp Wich <jo@mein.io>
Wed, 4 Sep 2019 11:29:37 +0000 (13:29 +0200)
Those are not used by any image check function anymore.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 3f4c785a6bbde87296e362c315f10b55c98843e3)

package/base-files/Makefile
package/base-files/files/lib/upgrade/stage2
package/base-files/files/sbin/sysupgrade

index 44aef87a204ae79864d081175b41731f7c188a89..7c63d3ef44f72250b3f7374411d650640fceb53b 100644 (file)
@@ -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/
index 0a11cb2005e81e2d69bc1b720d678930337ef812..fef121f37ce70043a1f4c699fd7050bfbdcfb0b1 100755 (executable)
@@ -6,9 +6,6 @@
 export IMAGE="$1"
 COMMAND="$2"
 
-export ARGV="$IMAGE"
-export ARGC=1
-
 export SAVE_CONFIG=1
 export SAVE_PARTITIONS=1
 
index 73291262e7dc57915f63fc93e4338ab8a8b8fd6d..001e6444760628c350213983a4d0505ac5ef1ec2 100755 (executable)
@@ -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