From 88549acb5e2e3e409b72ff876e32c589c3ea851f Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 22:36:56 +0800
Subject: support base package

---
 tests/projects/package/inherit_base/src/main.c        |  7 +++++++
 tests/projects/package/inherit_base/test.lua          | 10 ++++++++++
 tests/projects/package/inherit_base/xmake.lua         | 11 +++++++++++
 xmake/core/package/package.lua                        | 19 +++++++++++++++----
 xmake/modules/private/action/require/impl/package.lua | 17 +++++++++++++++++
 5 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100755 tests/projects/package/inherit_base/src/main.c
 create mode 100644 tests/projects/package/inherit_base/test.lua
 create mode 100644 tests/projects/package/inherit_base/xmake.lua

diff --git a/tests/projects/package/inherit_base/src/main.c b/tests/projects/package/inherit_base/src/main.c
new file mode 100755
index 000000000..9ae580511
--- /dev/null
+++ b/tests/projects/package/inherit_base/src/main.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char** argv)
+{
+    printf("hello world!\n");
+    return 0;
+}
diff --git a/tests/projects/package/inherit_base/test.lua b/tests/projects/package/inherit_base/test.lua
new file mode 100644
index 000000000..a6690754b
--- /dev/null
+++ b/tests/projects/package/inherit_base/test.lua
@@ -0,0 +1,10 @@
+function main(t)
+    -- freebsd ci is slower
+    if is_host("bsd") then
+        return
+    end
+    -- only for x86/x64, because it will take too long time on ci with arm/mips
+    if os.subarch():startswith("x") or os.subarch() == "i386" then
+        t:build()
+    end
+end
diff --git a/tests/projects/package/inherit_base/xmake.lua b/tests/projects/package/inherit_base/xmake.lua
new file mode 100644
index 000000000..3eea30f03
--- /dev/null
+++ b/tests/projects/package/inherit_base/xmake.lua
@@ -0,0 +1,11 @@
+package("myzlib")
+    set_base("zlib")
+    set_urls("https://github.com/madler/zlib.git")
+package_end()
+
+add_requires("myzlib", {system = false, alias = "zlib"})
+
+target("test")
+    set_kind("binary")
+    add_files("src/*.c")
+    add_packages("zlib")
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 379d1ddea..73b2731dd 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -68,11 +68,17 @@ function _instance:type()
     return "package"
 end
 
--- get the package configure
-function _instance:get(name)
+-- get the base package
+function _instance:base()
+    return self._BASE
+end
 
-    -- get it from info first
+-- get the package configuration
+function _instance:get(name)
     local value = self._INFO:get(name)
+    if value == nil and self:base() then
+        value = self:base():get(name)
+    end
     if value ~= nil then
         return value
     end
@@ -90,7 +96,11 @@ end
 
 -- get the extra configuration
 function _instance:extraconf(name, item, key)
-    return self._INFO:extraconf(name, item, key)
+    local conf = self._INFO:extraconf(name, item, key)
+    if conf == nil and self:base() then
+        conf = self:base():extraconf(name, item, key)
+    end
+    return conf
 end
 
 -- set the extra configuration
@@ -1811,6 +1821,7 @@ function package.apis()
         ,   "package.set_kind"
         ,   "package.set_plat" -- deprecated
         ,   "package.set_arch" -- deprecated
+        ,   "package.set_base"
         ,   "package.set_license"
         ,   "package.set_homepage"
         ,   "package.set_description"
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 07e2abc34..3534723d2 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -217,6 +217,17 @@ function _load_package_from_repository(packagename, opt)
     end
 end
 
+-- load package package from base
+function _load_package_from_base(package, basename, opt)
+    local package_base = _load_package_from_project(basename)
+    if not package_base then
+        package_base = _load_package_from_repository(basename, opt)
+    end
+    if package_base then
+        package._BASE = package_base
+    end
+end
+
 -- has locked requires?
 function _has_locked_requires(opt)
     opt = opt or {}
@@ -700,6 +711,12 @@ function _load_package(packagename, requireinfo, opt)
         end
     end
 
+    -- load base package
+    if package and package:get("base") then
+        _load_package_from_base(package, package:get("base", {
+            name = requireinfo.reponame, locked_repo = locked_requireinfo and locked_requireinfo.repo}))
+    end
+
     -- load package from system
     local system = requireinfo.system
     if system == nil then
-- 
cgit v1.3.1


From 8c2979c4f7b48aa108b8afe4eca2120e67bc498e Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 22:41:31 +0800
Subject: fix tests

---
 tests/projects/package/depconfigs/xmake.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/projects/package/depconfigs/xmake.lua b/tests/projects/package/depconfigs/xmake.lua
index c76e92df5..3580841f5 100644
--- a/tests/projects/package/depconfigs/xmake.lua
+++ b/tests/projects/package/depconfigs/xmake.lua
@@ -14,7 +14,7 @@ target("test")
         if target:pkg("libpng") then
             local found
             for _, linkdir in ipairs(target:pkg("libpng"):get("linkdirs")) do
-                if linkdir:find("zlib[/\\]1%.2%.10") then
+                if linkdir:find("zlib[/\\]v1%.2%.10") then
                     found = true
                 end
             end
-- 
cgit v1.3.1


From b7cd4692e8f94d2eb030d61f021f8ced4913d18e Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 22:57:23 +0800
Subject: update require lock

---
 .../package/multiconfig/xmake-requires.lock        | 88 ++++++++++++++--------
 .../package/toolchain_muslcc/xmake-requires.lock   | 88 ++++++++++------------
 2 files changed, 95 insertions(+), 81 deletions(-)

diff --git a/tests/projects/package/multiconfig/xmake-requires.lock b/tests/projects/package/multiconfig/xmake-requires.lock
index 359015a18..f53abf56f 100644
--- a/tests/projects/package/multiconfig/xmake-requires.lock
+++ b/tests/projects/package/multiconfig/xmake-requires.lock
@@ -1,31 +1,57 @@
-{
-    __meta__ = {
-        version = "1.0"
-    },
-    ["macosx|x86_64"] = {
-        ["zlib#31fecfc4"] = {
-            repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
-            },
-            version = "1.2.11"
-        },
-        ["zlib~debug#55833b12"] = {
-            repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
-            },
-            version = "1.2.11"
-        },
-        ["zlib~shared#b6ab42cb"] = {
-            repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
-            },
-            version = "1.2.11"
-        }
-    }
-}
+{
+    __meta__ = {
+        version = "1.0"
+    },
+    ["macosx|x86_64"] = {
+        ["zlib#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                url = "https://github.com/xmake-io/xmake-repo.git"
+            },
+            version = "1.2.11"
+        },
+        ["zlib~debug#55833b12"] = {
+            repo = {
+                branch = "master",
+                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                url = "https://github.com/xmake-io/xmake-repo.git"
+            },
+            version = "1.2.11"
+        },
+        ["zlib~shared#b6ab42cb"] = {
+            repo = {
+                branch = "master",
+                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                url = "https://github.com/xmake-io/xmake-repo.git"
+            },
+            version = "1.2.11"
+        }
+    },
+    ["windows|x64"] = {
+        ["zlib#31fecfc4"] = {
+            repo = {
+                branch = "master",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
+            },
+            version = "v1.2.11"
+        },
+        ["zlib~debug#55833b12"] = {
+            repo = {
+                branch = "master",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
+            },
+            version = "v1.2.11"
+        },
+        ["zlib~shared#b6ab42cb"] = {
+            repo = {
+                branch = "master",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
+            },
+            version = "v1.2.11"
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/projects/package/toolchain_muslcc/xmake-requires.lock b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
index 05f143646..800fcc782 100644
--- a/tests/projects/package/toolchain_muslcc/xmake-requires.lock
+++ b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
@@ -5,141 +5,129 @@
     ["macosx|x86_64"] = {
         ["autoconf#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "4498f11267de5112199152ab030ed139c985ad5a",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "2.71"
         },
         ["automake#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "1.16.4"
         },
         ["cmake#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "4498f11267de5112199152ab030ed139c985ad5a",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "d3260ca0867f8b26aa2a72818bca3e6113a4fc42",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
-            version = "3.21.0"
+            version = "3.22.1"
         },
         ["gmp#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "89ac4c1e2d360bc3a8c3f4cdedf4ee683701de74",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "6.2.1"
         },
         ["libisl 0.22#67114504"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "0.22"
         },
         ["libogg#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "v1.3.4"
         },
         ["libplist#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "2.2.0"
         },
         ["libtool#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "dd4abbd658b9897c9e1dcacf2e4bdeeb02d05860",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "2.4.6"
         },
         ["m4#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "89ac4c1e2d360bc3a8c3f4cdedf4ee683701de74",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "1.4.19"
         },
         ["muslcc#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "20210202"
         },
         ["pkg-config#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "89ac4c1e2d360bc3a8c3f4cdedf4ee683701de74",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
             version = "0.29.2"
         },
         ["zlib#31fecfc4"] = {
             repo = {
-                branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "/Users/ruki/projects/personal/xmake-repo/"
             },
-            version = "1.2.11"
+            version = "v1.2.11"
         }
     },
     ["windows|x64"] = {
         ["cmake#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "8e8c5e4d1c7e8b047b23333594d23b4b85163aed",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
             },
-            version = "3.21.0"
+            version = "3.22.1"
         },
         ["libogg#31fecfc4"] = {
             repo = {
                 branch = "master",
                 commit = "2b1cb74b289ae3221241985db4401a495c42fde3",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "v1.3.4"
         },
         ["make#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "2b1cb74b289ae3221241985db4401a495c42fde3",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "4.3"
         },
         ["muslcc#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "2b1cb74b289ae3221241985db4401a495c42fde3",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
             },
             version = "20210202"
         },
         ["zlib#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "2b1cb74b289ae3221241985db4401a495c42fde3",
-                url = "https://github.com/xmake-io/xmake-repo.git"
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
+                url = "https://gitee.com/tboox/xmake-repo.git"
             },
-            version = "1.2.11"
+            version = "v1.2.11"
         }
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.3.1


From eb8b368a8775c4ad648fd2239bfca20560cac154 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 12:49:39 +0800
Subject: Update xmake-requires.lock

---
 .../package/toolchain_muslcc/xmake-requires.lock   | 36 +++++++++++-----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/projects/package/toolchain_muslcc/xmake-requires.lock b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
index 800fcc782..027f0c27e 100644
--- a/tests/projects/package/toolchain_muslcc/xmake-requires.lock
+++ b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
@@ -6,84 +6,84 @@
         ["autoconf#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "2.71"
         },
         ["automake#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "1.16.4"
         },
         ["cmake#31fecfc4"] = {
             repo = {
                 commit = "d3260ca0867f8b26aa2a72818bca3e6113a4fc42",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "3.22.1"
         },
         ["gmp#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "6.2.1"
         },
         ["libisl 0.22#67114504"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "0.22"
         },
         ["libogg#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.3.4"
         },
         ["libplist#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "2.2.0"
         },
         ["libtool#31fecfc4"] = {
             repo = {
                 commit = "dd4abbd658b9897c9e1dcacf2e4bdeeb02d05860",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "2.4.6"
         },
         ["m4#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "1.4.19"
         },
         ["muslcc#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "20210202"
         },
         ["pkg-config#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "0.29.2"
         },
         ["zlib#31fecfc4"] = {
             repo = {
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "/Users/ruki/projects/personal/xmake-repo/"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.2.11"
         }
@@ -93,7 +93,7 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "3.22.1"
         },
@@ -101,7 +101,7 @@
             repo = {
                 branch = "master",
                 commit = "2b1cb74b289ae3221241985db4401a495c42fde3",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.3.4"
         },
@@ -109,7 +109,7 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "4.3"
         },
@@ -117,7 +117,7 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "20210202"
         },
@@ -125,9 +125,9 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.2.11"
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.3.1


From 841cfd53e3e4c9a73968b4577274c617d5774a47 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 12:51:25 +0800
Subject: Update xmake-requires.lock

---
 tests/projects/package/multiconfig/xmake-requires.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/projects/package/multiconfig/xmake-requires.lock b/tests/projects/package/multiconfig/xmake-requires.lock
index f53abf56f..8581b0ed5 100644
--- a/tests/projects/package/multiconfig/xmake-requires.lock
+++ b/tests/projects/package/multiconfig/xmake-requires.lock
@@ -33,7 +33,7 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.2.11"
         },
@@ -41,7 +41,7 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.2.11"
         },
@@ -49,9 +49,9 @@
             repo = {
                 branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
-                url = "https://gitee.com/tboox/xmake-repo.git"
+                url = "https://github.com/xmake-io/xmake-repo.git"
             },
             version = "v1.2.11"
         }
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.3.1


From a7200d30ba4e1e32bf0356d4d86858211e6ea188 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 23:16:51 +0800
Subject: fix lock file

---
 tests/projects/package/toolchain_muslcc/xmake-requires.lock | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tests/projects/package/toolchain_muslcc/xmake-requires.lock b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
index 027f0c27e..00f23d026 100644
--- a/tests/projects/package/toolchain_muslcc/xmake-requires.lock
+++ b/tests/projects/package/toolchain_muslcc/xmake-requires.lock
@@ -5,6 +5,7 @@
     ["macosx|x86_64"] = {
         ["autoconf#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -12,6 +13,7 @@
         },
         ["automake#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -19,6 +21,7 @@
         },
         ["cmake#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "d3260ca0867f8b26aa2a72818bca3e6113a4fc42",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -26,6 +29,7 @@
         },
         ["gmp#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -33,6 +37,7 @@
         },
         ["libisl 0.22#67114504"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -40,6 +45,7 @@
         },
         ["libogg#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -47,6 +53,7 @@
         },
         ["libplist#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -54,6 +61,7 @@
         },
         ["libtool#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "dd4abbd658b9897c9e1dcacf2e4bdeeb02d05860",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -61,6 +69,7 @@
         },
         ["m4#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -68,6 +77,7 @@
         },
         ["muslcc#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -75,6 +85,7 @@
         },
         ["pkg-config#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
@@ -82,6 +93,7 @@
         },
         ["zlib#31fecfc4"] = {
             repo = {
+                branch = "master",
                 commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
-- 
cgit v1.3.1


From a314a9b8d4131701a4dcd6140765836d092d3bc3 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Tue, 25 Jan 2022 23:20:15 +0800
Subject: fix lock again

---
 tests/projects/package/multiconfig/xmake-requires.lock | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/projects/package/multiconfig/xmake-requires.lock b/tests/projects/package/multiconfig/xmake-requires.lock
index 8581b0ed5..362eebba4 100644
--- a/tests/projects/package/multiconfig/xmake-requires.lock
+++ b/tests/projects/package/multiconfig/xmake-requires.lock
@@ -6,26 +6,26 @@
         ["zlib#31fecfc4"] = {
             repo = {
                 branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
-            version = "1.2.11"
+            version = "v1.2.11"
         },
         ["zlib~debug#55833b12"] = {
             repo = {
                 branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
-            version = "1.2.11"
+            version = "v1.2.11"
         },
         ["zlib~shared#b6ab42cb"] = {
             repo = {
                 branch = "master",
-                commit = "eda7adee81bac151f87c507030cc0dd8ab299462",
+                commit = "8d4f0875fe9a3c63be4948cefca9f232954e3e87",
                 url = "https://github.com/xmake-io/xmake-repo.git"
             },
-            version = "1.2.11"
+            version = "v1.2.11"
         }
     },
     ["windows|x64"] = {
-- 
cgit v1.3.1