Bump OpenHarmony version to 6.1

Author: hqzing

.gitignore

@@ -1,5 +1,5 @@
-OpenHarmony-v6.0-Release
-code-v6.0-Release.tar.gz
+OpenHarmony-v6.1-Release
+code-v6.1-Release.tar.gz
 system
 ramdisk
 curl-8.8.0-ohos-arm64

NOTICE.txt

@@ -71,7 +71,7 @@ Notices for file(s):
 ------------------------------------------------------------
 Notices for software(s):
 Software: toybox
-Version: 0.8.10
+Version: 0.8.12
 Path: //third_party/toybox
 ------------------------------------------------------------
 Copyright (C) 2006, 2019 by Rob Landley <rob@landley.net>
@@ -149,15 +149,15 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ============================================================
 Notices for file(s):
+/etc/ld-musl-namespace-aarch64-New.ini
+/etc/ld-musl-namespace-aarch64-flex.ini
 /etc/ld-musl-namespace-aarch64.ini
 ------------------------------------------------------------
 Notices for software(s):
 Software: musl
 Version: 1.2.5
 Software: OpenBSD
-Version: 7.6
-Software: openEuler:jemalloc
-Version: 5.3.0-1.oe2203sp3
+Version: 7.8
 Path: //third_party/musl
 ------------------------------------------------------------
 musl as a whole is licensed under the following standard MIT license:
@@ -1749,7 +1749,7 @@ Notices for file(s):
 ------------------------------------------------------------
 Notices for software(s):
 Software: PCRE2
-Version: pcre2-10.44
+Version: pcre2-10.46
 Path: //third_party/pcre2
 ------------------------------------------------------------
 PCRE2 LICENCE

README.md

@@ -28,7 +28,8 @@ docker exec -it ohos sh
 Available tags
 | Tag     | Description                                                             |
 |---------|-------------------------------------------------------------------------|
-| latest  | The latest release (currently equivalent to 6.0).                       |
+| latest  | The latest release (currently equivalent to 6.1).                       |
+| 6.1     | An image based on OpenHarmony 6.1 Release.                              |
 | 6.0     | An image based on OpenHarmony 6.0 Release.                              |
 | main    | The mainline version, built using the latest build scripts from the main branch of this repository. |
 

README.zh-CN.md

@@ -28,7 +28,8 @@ docker exec -it ohos sh
 可用的标签
 | 标签       | 描述                                                         |
 |------------|----------------------------------------------------------    |
-| latest     | 最新的正式版本（当前等价于 6.0）                             |
+| latest     | 最新的正式版本（当前等价于 6.1）                             |
+| 6.1        | 基于 OpenHarmony 6.1 Release 制作的镜像                      |
 | 6.0        | 基于 OpenHarmony 6.0 Release 制作的镜像                      |
 | main       | 主干版本，基于本仓库 main 分支的最新构建脚本进行构建         | 
 

build-curl.sh

@@ -2,7 +2,7 @@
 set -e
 
 # Setup ohos-sdk
-curl -fLO https://repo.huaweicloud.com/openharmony/os/6.0-Release/ohos-sdk-windows_linux-public.tar.gz
+curl -fLO https://repo.huaweicloud.com/openharmony/os/6.1-Release/ohos-sdk-windows_linux-public.tar.gz
 mkdir /opt/ohos-sdk
 tar -zxf ohos-sdk-windows_linux-public.tar.gz -C /opt/ohos-sdk
 cd /opt/ohos-sdk/linux

build-images.sh

@@ -31,15 +31,15 @@ apt install -y \
 WORKDIR=$(pwd)
 
 # Download OpenHarmony source code
-rm -rf OpenHarmony-v6.0-Release code-v6.0-Release.tar.gz
-aria2c -s 16 -x 16 -k 1M https://repo.huaweicloud.com/openharmony/os/6.0-Release/code-v6.0-Release.tar.gz
-tar -zxf code-v6.0-Release.tar.gz
-cd OpenHarmony-v6.0-Release/OpenHarmony
+rm -rf OpenHarmony-v6.1-Release code-v6.1-Release.tar.gz
+aria2c -s 16 -x 16 -k 1M https://repo.huaweicloud.com/openharmony/os/6.1-Release/code-v6.1-Release.tar.gz
+tar -zxf code-v6.1-Release.tar.gz
+cd OpenHarmony-v6.1-Release/OpenHarmony
 
 # Disable HiLog because the container does not include the HiLog service.
 cd third_party/musl/
 patch -p1 < $WORKDIR/disable-hilog.patch
 cd ../../
 
 # Build OpenHarmony operating system image, output in out/rk3568/packages/phone/images/
-./build.sh --product-name rk3568 --target-cpu arm64
+./build.sh --product-name rk3568 --target-cpu arm64 --build-target ramdisk_image --build-target system_image

build-rootfs.sh

@@ -7,12 +7,12 @@ apt install -y gzip cpio patchelf
 # Extract necessary files from the operating system image.
 rm -rf system ramdisk
 mkdir system-tmp
-mount -o loop OpenHarmony-v6.0-Release/OpenHarmony/out/rk3568/packages/phone/images/system.img system-tmp
+mount -o loop OpenHarmony-v6.1-Release/OpenHarmony/out/rk3568/packages/phone/images/system.img system-tmp
 cp -r system-tmp system
 umount system-tmp
 rm -rf system-tmp
 mkdir ramdisk
-cp OpenHarmony-v6.0-Release/OpenHarmony/out/rk3568/packages/phone/images/ramdisk.img ramdisk/ramdisk.img.gz
+cp OpenHarmony-v6.1-Release/OpenHarmony/out/rk3568/packages/phone/images/ramdisk.img ramdisk/ramdisk.img.gz
 cd ramdisk
 gunzip ramdisk.img.gz
 cpio -i -F ramdisk.img

disable-hilog.patch

@@ -1,10 +1,10 @@
 
 project third_party/musl/
 diff --git a/ldso/linux/dynlink.c b/ldso/linux/dynlink.c
-index 15914ac8..7d21a218 100644
+index d27b728ee..313d923a7 100644
 --- a/ldso/linux/dynlink.c
 +++ b/ldso/linux/dynlink.c
-@@ -3478,9 +3478,6 @@ void __dls3(size_t *sp, size_t *auxv, size_t *aux)
+@@ -3778,9 +3778,6 @@ void __dls3(size_t *sp, size_t *auxv, size_t *aux)
  	InitParameterClient();
  #endif
 
@@ -15,7 +15,7 @@ index 15914ac8..7d21a218 100644
  	InstallPACHandler();
  #endif
 diff --git a/porting/linux/user/src/hilog/hilog_adapter.c b/porting/linux/user/src/hilog/hilog_adapter.c
-index bfe1a34c..c73c5025 100644
+index bfe1a34cb..c73c50250 100644
 --- a/porting/linux/user/src/hilog/hilog_adapter.c
 +++ b/porting/linux/user/src/hilog/hilog_adapter.c
 @@ -69,32 +69,7 @@ static void Cleanup()
@@ -79,7 +79,7 @@ index bfe1a34c..c73c5025 100644
 
  #ifdef OHOS_ENABLE_PARAMETER
 diff --git a/src/hilog/linux/hilog_adapter.c b/src/hilog/linux/hilog_adapter.c
-index cbe371d5..a5893367 100644
+index df9d343a5..9764930f1 100644
 --- a/src/hilog/linux/hilog_adapter.c
 +++ b/src/hilog/linux/hilog_adapter.c
 @@ -65,19 +65,7 @@ extern int __close(int fd);
@@ -103,7 +103,7 @@ index cbe371d5..a5893367 100644
  }
 
  HILOG_LOCAL_API
-@@ -234,23 +222,12 @@ int HiLogAdapterVaList(LogType type, LogLevel level, unsigned int domain, const
+@@ -248,23 +236,12 @@ int HiLogAdapterVaList(LogType type, LogLevel level, unsigned int domain, const
 
  bool is_musl_log_enable()
  {
@@ -128,4 +128,4 @@ index cbe371d5..a5893367 100644
 +    return false;
  }
 
- #ifdef OHOS_ENABLE_PARAMETER
+ bool HiLogBaseIsLoggable(unsigned int domain, const char *tag, LogLevel level)