Skip to content

Commit 36d1223

Browse files
BernardXiongBernardXiong
authored
Merge pull request #27 from xqyjlj/xq-dev
更新
2 parents d07bbfb + aa241fa commit 36d1223

19 files changed

Lines changed: 135 additions & 43 deletions

File tree

‎apps/micropython/xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2022-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -22,7 +22,7 @@
2222
--
2323
add_rules("mode.debug", "mode.release")
2424

25-
add_requires("micropython", {configs = {shared = false}})
25+
add_requires("micropython")
2626

2727
target("micropython")
2828
do

‎apps/zlib/xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2022-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -23,7 +23,7 @@
2323

2424
add_rules("mode.debug", "mode.release")
2525

26-
add_requires("zlib", {configs = {shared = false}})
26+
add_requires("zlib")
2727

2828
target("zlib")
2929
do

‎repo/packages/b/busybox/patches/1.35.0/01_adapt_smart.diff‎

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,19 @@ index 827643808..d98d58ec9 100644
842842
}
843843
static int
844844
dup2_or_raise(int from, int to)
845+
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
846+
index 4c30f31f8..a152d3a73 100644
847+
--- a/util-linux/fdisk_gpt.c
848+
+++ b/util-linux/fdisk_gpt.c
849+
@@ -108,7 +108,7 @@ gpt_list_table(int xtra UNUSED_PARAM)
850+
int i;
851+
char numstr6[6];
852+
853+
- smart_ulltoa5(total_number_of_sectors * sector_size, numstr6, " KMGTPEZY")[0] = '\0';
854+
+ smart_ulltoa5((unsigned long long)total_number_of_sectors * (unsigned long long)sector_size, numstr6, " KMGTPEZY")[0] = '\0';
855+
printf("Disk %s: %llu sectors, %s\n", disk_device,
856+
(unsigned long long)total_number_of_sectors,
857+
numstr6);
845858
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
846859
index 6e2ff0a54..6ba039890 100644
847860
--- a/util-linux/fsfreeze.c
@@ -869,7 +882,7 @@ index 6d673002f..1f0ba5066 100644
869882
#ifndef FITRIM
870883
struct fstrim_range {
871884
diff --git a/util-linux/mount.c b/util-linux/mount.c
872-
index 4e65b6b46..08eff7a84 100644
885+
index 4e65b6b46..258ec69b2 100644
873886
--- a/util-linux/mount.c
874887
+++ b/util-linux/mount.c
875888
@@ -255,9 +255,9 @@
@@ -885,15 +898,29 @@ index 4e65b6b46..08eff7a84 100644
885898
#endif
886899

887900

888-
@@ -818,6 +818,7 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
901+
@@ -806,7 +806,13 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
902+
update_mtab_entry_on_move(mp);
903+
else
904+
#endif
905+
+ {
906+
+ if (mp->mnt_opts[0] == '\0')
907+
+ {
908+
+ append_mount_options(&(mp->mnt_opts), "rw");
909+
+ }
910+
addmntent(mountTable, mp);
911+
+ }
912+
endmntent(mountTable);
913+
914+
if (ENABLE_FEATURE_CLEAN_UP) {
915+
@@ -818,6 +824,7 @@ static int mount_it_now(struct mntent *mp, unsigned long vfsflags, char *filtero
889916
return rc;
890917
}
891918

892919
+#if 0
893920
#if ENABLE_FEATURE_MOUNT_NFS
894921

895922
/*
896-
@@ -1912,6 +1913,8 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
923+
@@ -1912,6 +1919,8 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
897924

898925
#endif // !ENABLE_FEATURE_MOUNT_NFS
899926

@@ -902,27 +929,40 @@ index 4e65b6b46..08eff7a84 100644
902929
// Find "...,NAME=NUM,..." in the option string, remove "NAME=NUM" option
903930
// and return NUM.
904931
// Return 0 if not found.
905-
@@ -2089,6 +2092,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
932+
@@ -2089,6 +2098,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
906933
}
907934

908935
// Might this be an NFS filesystem?
909936
+#if 0
910937
if (!(vfsflags & (MS_BIND | MS_MOVE))
911938
&& (!mp->mnt_type || is_prefixed_with(mp->mnt_type, "nfs"))
912939
) {
913-
@@ -2102,6 +2106,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
940+
@@ -2102,6 +2112,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
914941
goto report_error;
915942
}
916943
}
917944
+#endif
918945

919946
// Look at the file. (Not found isn't a failure for remount, or for
920947
// a synthetic filesystem like proc or sysfs.)
921-
@@ -2151,6 +2156,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
948+
@@ -2151,6 +2162,7 @@ static int singlemount(struct mntent *mp, int ignore_busy)
922949
// If we know the fstype (or don't need to), jump straight
923950
// to the actual mount.
924951
if (mp->mnt_type || (vfsflags & (MS_REMOUNT | MS_BIND | MS_MOVE))) {
925-
+
952+
+
926953
char *next;
927954
for (;;) {
928955
next = mp->mnt_type ? strchr(mp->mnt_type, ',') : NULL;
956+
diff --git a/util-linux/umount.c b/util-linux/umount.c
957+
index 23da32868..18d5dea67 100644
958+
--- a/util-linux/umount.c
959+
+++ b/util-linux/umount.c
960+
@@ -169,6 +169,8 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
961+
argv++;
962+
path = xmalloc_realpath(zapit);
963+
if (path) {
964+
+ size_t length = strlen(path);
965+
+ path[length - 1] = '\0';
966+
for (m = mtl; m; m = m->next)
967+
if (strcmp(path, m->dir) == 0 || strcmp(path, m->device) == 0)
968+
break;

‎repo/packages/b/busybox/port/1.35.0/.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#
22
# Automatically generated make config: don't edit
33
# Busybox version: 1.35.0
4-
# Wed Jun 7 23:22:30 2023
4+
# Thu Jun 15 19:49:52 2023
55
#
66
CONFIG_HAVE_DOT_CONFIG=y
77

@@ -709,7 +709,7 @@ CONFIG_UNSHARE=y
709709
#
710710
CONFIG_FEATURE_MOUNT_LOOP=y
711711
CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
712-
# CONFIG_FEATURE_MTAB_SUPPORT is not set
712+
CONFIG_FEATURE_MTAB_SUPPORT=y
713713
CONFIG_VOLUMEID=y
714714

715715
#

‎repo/packages/b/busybox/scripts/deploy.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2023-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file deploy.lua
1717
--
1818
-- Change Logs:

‎repo/packages/b/busybox/xmake.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2023-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -30,7 +30,7 @@ do
3030
add_versions("1.35.0", "faeeb244c35a348a334f4a59e44626ee870fb07b6884d68c10ae8bc19f83a694")
3131

3232
add_patches("1.35.0", path.join(os.scriptdir(), "patches", "1.35.0", "01_adapt_smart.diff"),
33-
"1bbfbe1c98f8693e10978fc4e7b350af444f59e5b5655bcc2ef753059ea77e54")
33+
"897875a5c8af75164d2e089e9f3869ad4ee0a329f7ee80b4a9752c88ba18c8cc")
3434

3535
on_install("cross@linux", function(package)
3636
import("rt.private.build.rtflags")

‎repo/packages/f/ffmpeg/xmake.lua‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2023-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -30,7 +30,11 @@ do
3030

3131
add_versions("5.1.2", "39a0bcc8d98549f16c570624678246a6ac736c066cebdb409f9502e915b22f2b")
3232

33-
add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
33+
add_configs("shared", {
34+
description = "Build shared library.",
35+
default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
36+
type = "boolean"
37+
})
3438

3539
on_install("cross@linux", function(package)
3640
import("rt.private.build.rtflags")

‎repo/packages/l/libffi/xmake.lua‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2022-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -33,7 +33,11 @@ do
3333
add_patches("3.4.4", path.join(os.scriptdir(), "patches", "3.4.4", "01_src_tramp.diff"),
3434
"6a16954ca8c1b1549b2f0eae369b1abe11cdbb70e7d1e94c32f94defbae4bc60")
3535

36-
add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
36+
add_configs("shared", {
37+
description = "Build shared library.",
38+
default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
39+
type = "boolean"
40+
})
3741

3842
on_install("cross@linux", function(package)
3943
import("rt.private.build.rtflags")

‎repo/packages/l/libjpeg/xmake.lua‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2022-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -33,7 +33,11 @@ do
3333
add_versions("v9d", "2303a6acfb6cc533e0e86e8a9d29f7e6079e118b9de3f96e07a71a11c082fa6a")
3434
add_versions("v9e", "4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d")
3535

36-
add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
36+
add_configs("shared", {
37+
description = "Build shared library.",
38+
default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
39+
type = "boolean"
40+
})
3741

3842
on_install("cross@linux", function(package)
3943
import("rt.private.build.rtflags")

‎repo/packages/l/libpng/xmake.lua‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
--
1313
-- Copyright (C) 2022-2023 RT-Thread Development Team
1414
--
15-
-- @author xqyjlj
15+
-- @author xqyjlj
1616
-- @file xmake.lua
1717
--
1818
-- Change Logs:
@@ -36,7 +36,11 @@ do
3636
add_versions("v1.6.38", "e1ab4aae9b88329d34bd1ca47adf3fb06c10153dbb660f4c80e2673f9fa94b24")
3737
add_versions("v1.6.39", "eca1ea183643d0b35a764554ede4714cf5dbc30b66845630d81b995c3b2dd571")
3838

39-
add_configs("shared", {description = "Build shared library.", default = true, type = "boolean"})
39+
add_configs("shared", {
40+
description = "Build shared library.",
41+
default = os.getenv("RT_XMAKE_LINK_TYPE") ~= "static",
42+
type = "boolean"
43+
})
4044

4145
on_load(function(package)
4246
package:add("deps", "zlib", {debug = package:config("debug"), configs = {shared = package:config("shared")}})

0 commit comments

Comments
 (0)