RT-Thread · BernardXiong · Jul 7, 2023 · Jul 5, 2023 · Jul 5, 2023
diff --git a/apps/micropython/xmake.lua b/apps/micropython/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -22,7 +22,7 @@
 --
 add_rules("mode.debug", "mode.release")
 
-add_requires("micropython", {configs = {shared = false}})
+add_requires("micropython")
 
 target("micropython")
 do

diff --git a/apps/zlib/xmake.lua b/apps/zlib/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -23,7 +23,7 @@
 
 add_rules("mode.debug", "mode.release")
 
-add_requires("zlib", {configs = {shared = false}})
+add_requires("zlib")
 
 target("zlib")
 do

diff --git a/repo/packages/b/busybox/patches/1.35.0/01_adapt_smart.diff b/repo/packages/b/busybox/patches/1.35.0/01_adapt_smart.diff
@@ -842,6 +842,19 @@ index 827643808..d98d58ec9 100644
  }
  static int
  dup2_or_raise(int from, int to)
+diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
+index 4c30f31f8..a152d3a73 100644
+--- a/util-linux/fdisk_gpt.c
++++ b/util-linux/fdisk_gpt.c
+@@ -108,7 +108,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
+ 	int i;
+ 	char numstr6[6];
+
+-	smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY")[0] = '\0';
++	smart_ulltoa5((unsigned long long)total_number_of_sectors * (unsigned long long)sector_size, numstr6, " KMGTPEZY")[0] = '\0';
+ 	printf("Disk %s: %llu sectors, %s\n", disk_device,
+ 		(unsigned long long)total_number_of_sectors,
+ 		numstr6);
 diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
 index 6e2ff0a54..6ba039890 100644
 --- a/util-linux/fsfreeze.c
@@ -869,7 +882,7 @@ index 6d673002f..1f0ba5066 100644
  #ifndef FITRIM
  struct fstrim_range {
 diff --git a/util-linux/mount.c b/util-linux/mount.c
-index 4e65b6b46..08eff7a84 100644
+index 4e65b6b46..258ec69b2 100644
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
 @@ -255,9 +255,9 @@
@@ -885,15 +898,29 @@ index 4e65b6b46..08eff7a84 100644
  #endif
 
 
-@@ -818,6 +818,7 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
+@@ -806,7 +806,13 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
+ 			update_mtab_entry_on_move(mp);
+ 		else
+ #endif
++		{
++			if (mp->mnt_opts[0] == '\0')
++			{
++				append_mount_options(&(mp->mnt_opts), "rw");
++			}
+ 			addmntent(mountTable, mp);
++		}
+ 		endmntent(mountTable);
+
+ 		if (ENABLE_FEATURE_CLEAN_UP) {
+@@ -818,6 +824,7 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
  	return rc;
  }
 
 +#if 0
  #if ENABLE_FEATURE_MOUNT_NFS
 
  /*
-@@ -1912,6 +1913,8 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
+@@ -1912,6 +1919,8 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
 
  #endif // !ENABLE_FEATURE_MOUNT_NFS
 
@@ -902,27 +929,40 @@ index 4e65b6b46..08eff7a84 100644
  // Find "...,NAME=NUM,..." in the option string, remove "NAME=NUM" option
  // and return NUM.
  // Return 0 if not found.
-@@ -2089,6 +2092,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
+@@ -2089,6 +2098,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
  	}
 
  	// Might this be an NFS filesystem?
 +#if 0
  	if (!(vfsflags & (MS_BIND | MS_MOVE))
  	 && (!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
  	) {
-@@ -2102,6 +2106,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
+@@ -2102,6 +2112,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
  			goto report_error;
  		}
  	}
 +#endif
 
  	// Look at the file.  (Not found isn't a failure for remount, or for
  	// a synthetic filesystem like proc or sysfs.)
-@@ -2151,6 +2156,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
+@@ -2151,6 +2162,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
  	// If we know the fstype (or don't need to), jump straight
  	// to the actual mount.
  	if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
-+		
++
  		char *next;
  		for (;;) {
  			next = mp->mnt_type ? strchr(mp->mnt_type, ',') : NULL;
+diff --git a/util-linux/umount.c b/util-linux/umount.c
+index 23da32868..18d5dea67 100644
+--- a/util-linux/umount.c
++++ b/util-linux/umount.c
+@@ -169,6 +169,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
+ 			argv++;
+ 			path = xmalloc_realpath(zapit);
+ 			if (path) {
++				size_t length = strlen(path);
++				path[length - 1] = '\0';
+ 				for (m = mtl; m; m = m->next)
+ 					if (strcmp(path, m->dir) == 0 || strcmp(path, m->device) == 0)
+ 						break;
diff --git a/repo/packages/b/busybox/port/1.35.0/.config b/repo/packages/b/busybox/port/1.35.0/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.35.0
-# Wed Jun  7 23:22:30 2023
+# Thu Jun 15 19:49:52 2023
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -709,7 +709,7 @@ CONFIG_UNSHARE=y
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
+CONFIG_FEATURE_MTAB_SUPPORT=y
 CONFIG_VOLUMEID=y
 
 #

diff --git a/repo/packages/b/busybox/scripts/deploy.lua b/repo/packages/b/busybox/scripts/deploy.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        deploy.lua
 --
 -- Change Logs:

diff --git a/repo/packages/b/busybox/xmake.lua b/repo/packages/b/busybox/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -30,7 +30,7 @@ do
     add_versions("1.35.0", "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694")
 
     add_patches("1.35.0", path.join(os.scriptdir(), "patches", "1.35.0", "01_adapt_smart.diff"),
-                "1bbfbe1c98f8693e10978fc4e7b350af444f59e5b5655bcc2ef753059ea77e54")
+                "897875a5c8af75164d2e089e9f3869ad4ee0a329f7ee80b4a9752c88ba18c8cc")
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/f/ffmpeg/xmake.lua b/repo/packages/f/ffmpeg/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -30,7 +30,11 @@ do
 
     add_versions("5.1.2", "39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/l/libffi/xmake.lua b/repo/packages/l/libffi/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -33,7 +33,11 @@ do
     add_patches("3.4.4", path.join(os.scriptdir(), "patches", "3.4.4", "01_src_tramp.diff"),
                 "6a16954ca8c1b1549b2f0eae369b1abe11cdbb70e7d1e94c32f94defbae4bc60")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/l/libjpeg/xmake.lua b/repo/packages/l/libjpeg/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -33,7 +33,11 @@ do
     add_versions("v9d", "2303a6acfb6cc533e0e86e8a9d29f7e6079e118b9de3f96e07a71a11c082fa6a")
     add_versions("v9e", "4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/l/libpng/xmake.lua b/repo/packages/l/libpng/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -36,7 +36,11 @@ do
     add_versions("v1.6.38", "e1ab4aae9b88329d34bd1ca47adf3fb06c10153dbb660f4c80e2673f9fa94b24")
     add_versions("v1.6.39", "eca1ea183643d0b35a764554ede4714cf5dbc30b66845630d81b995c3b2dd571")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_load(function(package)
         package:add("deps", "zlib", {debug = package:config("debug"), configs = {shared = package:config("shared")}})

diff --git a/repo/packages/l/lua/xmake.lua b/repo/packages/l/lua/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -32,7 +32,11 @@ do
     add_patches("5.1.4", path.join(os.scriptdir(), "patches", "5.1.4", "01_makefile.diff"),
                 "ce22ca035ebc054876005aa252c2284266c1f34706b12f7219165dbcd5797e4b")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_load(function(package)
         package:add("deps", "readline", {debug = package:config("debug"), configs = {shared = package:config("shared")}})

diff --git a/repo/packages/m/micropython/xmake.lua b/repo/packages/m/micropython/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -32,7 +32,11 @@ do
     add_patches("1.20.0", path.join(os.scriptdir(), "patches", "1.20.0", "01_adapt_smart.diff"),
                 "d0eb05d02339977f9c5771dcc81d2a616962ec57cb4d272fe8da3b8b22cc830c")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
     add_configs("with_ffi", {description = "use libffi library.", default = false, type = "boolean"})
 
     on_load(function(package)

diff --git a/repo/packages/n/ncurses/xmake.lua b/repo/packages/n/ncurses/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -32,7 +32,11 @@ do
 
     add_versions("6.4", "6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/o/openssl/xmake.lua b/repo/packages/o/openssl/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2022-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -41,7 +41,11 @@ do
     add_patches("1.1.1-i", path.join(os.scriptdir(), "patches", "1.1.1-i", "03_include_linux_version.diff"),
                 "334e52ac96629e2c0e2c35b77bfa597a22fd10c7d3b1c5ed8ac95b7275505373")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
 
     on_install("cross@linux", function(package)
         import("rt.private.build.rtflags")

diff --git a/repo/packages/p/pcre/xmake.lua b/repo/packages/p/pcre/xmake.lua
@@ -12,7 +12,7 @@
 --
 -- Copyright (C) 2023-2023 RT-Thread Development Team
 --
--- @author      xqyjlj  
+-- @author      xqyjlj
 -- @file        xmake.lua
 --
 -- Change Logs:
@@ -28,7 +28,11 @@ do
     add_urls("https://github.com/xmake-mirror/pcre/releases/download/$(version)/pcre-$(version).tar.bz2")
     add_versions("8.45", "4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8")
 
-    add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
+    add_configs("shared", {
+        description = "Build shared library.",
+        default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
+        type = "boolean"
+    })
     add_configs("jit", {description = "Enable jit.", default = false, type = "boolean"})
     add_configs("bitwidth", {description = "Set the code unit width.", default = "8", values = {"8", "16", "32"}})