From 984919fd52c35a6f9a394d293ff3644cbde321e9 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Thu, 2 Sep 2021 10:20:03 +0800 Subject: [PATCH] rebrand: Rebrand to Anolis OS --- 0001-binutils-anolis-rebrand.patch | 162 +++++++++++++++++++++++++++++ binutils.spec | 14 ++- 2 files changed, 174 insertions(+), 2 deletions(-) create mode 100644 0001-binutils-anolis-rebrand.patch diff --git a/0001-binutils-anolis-rebrand.patch b/0001-binutils-anolis-rebrand.patch new file mode 100644 index 0000000..6a869ee --- /dev/null +++ b/0001-binutils-anolis-rebrand.patch @@ -0,0 +1,162 @@ +diff -Nuar binutils-2.27.orig/bfd/po/da.po binutils-2.27/bfd/po/da.po +--- binutils-2.27.orig/bfd/po/da.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/da.po 2021-09-02 10:13:49.723295407 +0800 +@@ -1923,8 +1923,8 @@ + msgstr "%s er ikke defineret i lænker-oprettet %s" + + #: elf32-rx.c:544 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Advarsel: forældet Red Hat-relokering " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Advarsel: forældet Anolis-relokering " + + #: elf32-rx.c:1086 + msgid "Warning: RX_SYM reloc with an unknown symbol" +diff -Nuar binutils-2.27.orig/bfd/po/es.po binutils-2.27/bfd/po/es.po +--- binutils-2.27.orig/bfd/po/es.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/es.po 2021-09-02 10:13:49.768294135 +0800 +@@ -2022,8 +2022,8 @@ + msgstr "%P: no se definió %s en el %s creado por el enlazador\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Aviso: reubicación Red Hat obsoleta" ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Aviso: reubicación Anolis obsoleta" + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/fi.po binutils-2.27/bfd/po/fi.po +--- binutils-2.27.orig/bfd/po/fi.po 2015-11-13 16:27:40.000000000 +0800 ++++ binutils-2.27/bfd/po/fi.po 2021-09-02 10:13:49.874291137 +0800 +@@ -2329,8 +2329,8 @@ + msgstr " [G10]" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Varoitus: vanhentunut Red Hat reloc -tietue " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Varoitus: vanhentunut Anolis reloc -tietue " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/fr.po binutils-2.27/bfd/po/fr.po +--- binutils-2.27.orig/bfd/po/fr.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/fr.po 2021-09-02 10:13:49.640297755 +0800 +@@ -2023,8 +2023,8 @@ + msgstr "%P: %s pas défini dans %s créé par l'éditeur de liens\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Attention: relocalisation Red Hat réprouvée " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Attention: relocalisation Anolis réprouvée " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/ja.po binutils-2.27/bfd/po/ja.po +--- binutils-2.27.orig/bfd/po/ja.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/ja.po 2021-09-02 10:13:49.977288224 +0800 +@@ -2018,8 +2018,8 @@ + msgstr "%s はリンカが作成した %s 内では定義されていません\n" + + #: elf32-rx.c:553 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: 警告: 廃止された Red Hat 再配置です " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: 警告: 廃止された Anolis 再配置です " + + #: elf32-rx.c:1095 + msgid "Warning: RX_SYM reloc with an unknown symbol" +diff -Nuar binutils-2.27.orig/bfd/po/ru.po binutils-2.27/bfd/po/ru.po +--- binutils-2.27.orig/bfd/po/ru.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/ru.po 2021-09-02 10:13:49.915289978 +0800 +@@ -2023,8 +2023,8 @@ + msgstr "%P: %s не определено в компоновщике, созданном %s\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: предупреждение: устаревшее перемещение Red Hat " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: предупреждение: устаревшее перемещение Anolis " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/sr.po binutils-2.27/bfd/po/sr.po +--- binutils-2.27.orig/bfd/po/sr.po 2016-08-03 15:36:51.000000000 +0800 ++++ binutils-2.27/bfd/po/sr.po 2021-09-02 10:13:49.830292381 +0800 +@@ -2301,7 +2301,7 @@ + msgstr " [Г10]" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " ++msgid "%B:%A: Warning: deprecated Anolis reloc " + msgstr "%B:%A: Упозорење: застарело премештање Ред Хета " + + #. Check for unsafe relocs in PID mode. These are any relocs where +diff -Nuar binutils-2.27.orig/bfd/po/sv.po binutils-2.27/bfd/po/sv.po +--- binutils-2.27.orig/bfd/po/sv.po 2016-08-03 15:36:51.000000000 +0800 ++++ binutils-2.27/bfd/po/sv.po 2021-09-02 10:13:49.598298942 +0800 +@@ -2305,8 +2305,8 @@ + msgstr " [G10]" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Varning: föråldrad Red Hat-omlokalisering " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Varning: föråldrad Anolis-omlokalisering " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/uk.po binutils-2.27/bfd/po/uk.po +--- binutils-2.27.orig/bfd/po/uk.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/uk.po 2021-09-02 10:13:49.682296567 +0800 +@@ -2027,8 +2027,8 @@ + msgstr "%P: %s не визначено у компонувальнику, створеному %s\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: попередження: застарілий формат пересування Red Hat " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: попередження: застарілий формат пересування Anolis " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/vi.po binutils-2.27/bfd/po/vi.po +--- binutils-2.27.orig/bfd/po/vi.po 2013-11-04 23:33:37.000000000 +0800 ++++ binutils-2.27/bfd/po/vi.po 2021-09-02 10:13:49.808293004 +0800 +@@ -2028,8 +2028,8 @@ + msgstr "%P: %s chưa được định nghĩa trong bộ liên kết đã tạo ra %s\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Cảnh báo: không tán thành reloc kiểu Red Hat" ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Cảnh báo: không tán thành reloc kiểu Anolis" + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff -Nuar binutils-2.27.orig/bfd/po/zh_CN.po binutils-2.27/bfd/po/zh_CN.po +--- binutils-2.27.orig/bfd/po/zh_CN.po 2016-08-03 15:36:51.000000000 +0800 ++++ binutils-2.27/bfd/po/zh_CN.po 2021-09-02 10:13:49.938289327 +0800 +@@ -2405,7 +2405,7 @@ + + #: elf32-rx.c:563 + #, fuzzy +-msgid "%B:%A: Warning: deprecated Red Hat reloc " ++msgid "%B:%A: Warning: deprecated Anolis reloc " + msgstr "%s：0x%lx：警告：无法找到预期的重定位" + + #. Check for unsafe relocs in PID mode. These are any relocs where +diff -Nuar binutils-2.27.orig/zlib/contrib/minizip/configure.ac binutils-2.27/zlib/contrib/minizip/configure.ac +--- binutils-2.27.orig/zlib/contrib/minizip/configure.ac 2016-08-03 15:36:56.000000000 +0800 ++++ binutils-2.27/zlib/contrib/minizip/configure.ac 2021-09-02 10:15:00.885282906 +0800 +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com]) ++AC_INIT([minizip], [1.2.8], [https://bugs.openanolis.cn]) + AC_CONFIG_SRCDIR([minizip.c]) + AM_INIT_AUTOMAKE([foreign]) + LT_INIT diff --git a/binutils.spec b/binutils.spec index d65a9ca..3b4726f 100644 --- a/binutils.spec +++ b/binutils.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # rpmbuild parameters: # --define "binutils_target arm-linux-gnu" to create arm-linux-gnu-binutils. # --with=bootstrap: Build with minimal dependencies. @@ -54,7 +55,7 @@ Version: 2.27 # Note: The Release string *must* be different from that used by any of the # devtoolset binutils associated with this release. That is why ".base" # has been appended here. See BZ 1337617 for more details. -Release: 44.base%{?dist}.1 +Release: 44.base%{anolis_release}%{?dist}.1 License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -403,6 +404,10 @@ Patch999: binutils-SUPPRESS-PPC-TLBIE-CHECK.patch #CentOS armhfp Patch9999: binutils-armhfp-fix.patch + +#Add by Anolis +Patch1000: 0001-binutils-anolis-rebrand.patch +#end #--------------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -591,6 +596,7 @@ using libelf instead of BFD. # TEMPORARY patches. %patch998 -p1 %patch999 -p1 +%patch1000 -p1 %ifarch %{arm} %patch9999 -p1 @@ -715,7 +721,7 @@ CFLAGS="$CFLAGS -O0 -ggdb2 -Wno-error -D_FORTIFY_SOURCE=0" %endif $CARGS \ --enable-plugins \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla/ + --with-bugurl=https://bugs.openanolis.cn %if %{with docs} make %{_smp_mflags} tooldir=%{_prefix} all @@ -1001,6 +1007,10 @@ exit 0 #--------------------------------------------------------------------------------- %changelog +* Thu Jan 06 2022 Jacob Wang - 2.27-44.base.0.1.1 +- Rebrand to Anolis OS +- Cherry-pick [6c68501] + * Fri Oct 22 2021 Nick Clifton - 2.27-44.base.1 - Add ability to control the display of unicode characters. (#2009168) -- Gitee