From 2b8332b8d25ee67a82b6496cd871eeae963188c2 Mon Sep 17 00:00:00 2001 From: yangxiaoxuan Date: Mon, 25 Jan 2021 09:30:12 +0800 Subject: [PATCH] rebrand: Rebrand to Anolis OS Signed-off-by: yangxiaoxuan --- 0001-binutils-anolis-rebrand.patch | 241 +++++++++++++++++++++++++++++ binutils.spec | 12 +- 2 files changed, 251 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..0b71807 --- /dev/null +++ b/0001-binutils-anolis-rebrand.patch @@ -0,0 +1,241 @@ +From e784eaaa48e00d5ba8da5c74a57459c662c078f6 Mon Sep 17 00:00:00 2001 +From: xuehaolin +Date: Sun, 24 Jan 2021 10:55:25 +0800 +Subject: [PATCH] rebrand + +--- + bfd/elf32-rx.c | 2 +- + bfd/po/da.po | 4 ++-- + bfd/po/es.po | 4 ++-- + bfd/po/fi.po | 4 ++-- + bfd/po/fr.po | 4 ++-- + bfd/po/hr.po | 2 +- + bfd/po/id.po | 4 ++-- + bfd/po/ja.po | 4 ++-- + bfd/po/ru.po | 4 ++-- + bfd/po/sr.po | 2 +- + bfd/po/sv.po | 4 ++-- + bfd/po/uk.po | 4 ++-- + bfd/po/vi.po | 4 ++-- + bfd/po/zh_CN.po | 2 +- + zlib/contrib/minizip/configure.ac | 2 +- + 15 files changed, 25 insertions(+), 25 deletions(-) + +diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c +index a0e1f782..559a9d2a 100644 +--- a/bfd/elf32-rx.c ++++ b/bfd/elf32-rx.c +@@ -665,7 +665,7 @@ rx_elf_relocate_section + #define OP(i) (contents[rel->r_offset + (i)]) + #define WARN_REDHAT(type) \ + /* xgettext:c-format */ \ +- _bfd_error_handler (_("%B:%A: Warning: deprecated Red Hat reloc " type " detected against: %s."), \ ++ _bfd_error_handler (_("%B:%A: Warning: deprecated Anolis reloc " type " detected against: %s."), \ + input_bfd, input_section, name) + + /* Check for unsafe relocs in PID mode. These are any relocs where +diff --git a/bfd/po/da.po b/bfd/po/da.po +index add4ce42..2ce40ff2 100644 +--- a/bfd/po/da.po ++++ b/bfd/po/da.po +@@ -2345,8 +2345,8 @@ msgid " [G10]" + msgstr " [G10]" + + #: elf32-rx.c:563 +-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 " + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff --git a/bfd/po/es.po b/bfd/po/es.po +index 73e12b5b..742b11f6 100644 +--- a/bfd/po/es.po ++++ b/bfd/po/es.po +@@ -2023,8 +2023,8 @@ msgid "%P: %s not defined in linker created %s\n" + 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 --git a/bfd/po/fi.po b/bfd/po/fi.po +index 14752f46..9165fd4a 100644 +--- a/bfd/po/fi.po ++++ b/bfd/po/fi.po +@@ -2330,8 +2330,8 @@ msgid " [G10]" + 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 --git a/bfd/po/fr.po b/bfd/po/fr.po +index dc26e566..b339dba8 100644 +--- a/bfd/po/fr.po ++++ b/bfd/po/fr.po +@@ -3303,8 +3303,8 @@ msgstr "%B:%A: l'entrée %s de la table n'est pas alignée sur un mot dans la ta + + #: elf32-rx.c:668 + #, c-format +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Attention: réadressage Red Hat réprouvée " ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Attention: réadressage 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 --git a/bfd/po/hr.po b/bfd/po/hr.po +index 66723aec..d57da036 100644 +--- a/bfd/po/hr.po ++++ b/bfd/po/hr.po +@@ -1981,7 +1981,7 @@ msgid "%P: %s not defined in linker created %s\n" + msgstr "" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " ++msgid "%B:%A: Warning: deprecated Anolis reloc " + msgstr "" + + #. Check for unsafe relocs in PID mode. These are any relocs where +diff --git a/bfd/po/id.po b/bfd/po/id.po +index b0acde81..147026a0 100644 +--- a/bfd/po/id.po ++++ b/bfd/po/id.po +@@ -2022,8 +2022,8 @@ msgid "%P: %s not defined in linker created %s\n" + msgstr "%P: %s tidak didefinisikan dalam penyambung dibuat oleh %s\n" + + #: elf32-rx.c:563 +-msgid "%B:%A: Warning: deprecated Red Hat reloc " +-msgstr "%B:%A: Peringatan: tertinggal Red Hat relokasi" ++msgid "%B:%A: Warning: deprecated Anolis reloc " ++msgstr "%B:%A: Peringatan: tertinggal Anolis relokasi" + + #. Check for unsafe relocs in PID mode. These are any relocs where + #. an absolute address is being computed. There are special cases +diff --git a/bfd/po/ja.po b/bfd/po/ja.po +index da371dcc..9a8e4b8e 100644 +--- a/bfd/po/ja.po ++++ b/bfd/po/ja.po +@@ -2019,8 +2019,8 @@ msgid "%s not defined in linker created %s\n" + 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 --git a/bfd/po/ru.po b/bfd/po/ru.po +index 194011d4..f54e6730 100644 +--- a/bfd/po/ru.po ++++ b/bfd/po/ru.po +@@ -3298,8 +3298,8 @@ msgstr "%B:%A: элемент таблицы %s не выровнен в таб + + #: elf32-rx.c:668 + #, c-format +-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 --git a/bfd/po/sr.po b/bfd/po/sr.po +index c0e8a24f..72b11ee9 100644 +--- a/bfd/po/sr.po ++++ b/bfd/po/sr.po +@@ -2302,7 +2302,7 @@ msgid " [G10]" + 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 --git a/bfd/po/sv.po b/bfd/po/sv.po +index 7213fe22..638915c3 100644 +--- a/bfd/po/sv.po ++++ b/bfd/po/sv.po +@@ -2306,8 +2306,8 @@ msgid " [G10]" + 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 --git a/bfd/po/uk.po b/bfd/po/uk.po +index 437d767a..dc4596a7 100644 +--- a/bfd/po/uk.po ++++ b/bfd/po/uk.po +@@ -3300,8 +3300,8 @@ msgstr "%B:%A: запис таблиці %s не вирівняно на меж + + #: elf32-rx.c:668 + #, c-format +-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 --git a/bfd/po/vi.po b/bfd/po/vi.po +index 79a6622f..93ef7bd4 100644 +--- a/bfd/po/vi.po ++++ b/bfd/po/vi.po +@@ -2027,8 +2027,8 @@ msgid "%P: %s not defined in linker created %s\n" + 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 --git a/bfd/po/zh_CN.po b/bfd/po/zh_CN.po +index 882b3cc2..e702d7f1 100644 +--- a/bfd/po/zh_CN.po ++++ b/bfd/po/zh_CN.po +@@ -2406,7 +2406,7 @@ msgstr "" + + #: 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 --git a/zlib/contrib/minizip/configure.ac b/zlib/contrib/minizip/configure.ac +index 5b119709..3d43339d 100644 +--- a/zlib/contrib/minizip/configure.ac ++++ b/zlib/contrib/minizip/configure.ac +@@ -1,7 +1,7 @@ + # -*- Autoconf -*- + # Process this file with autoconf to produce a configure script. + +-AC_INIT([minizip], [1.2.11], [bugzilla.redhat.com]) ++AC_INIT([minizip], [1.2.11], [https://bugzilla.openanolis.cn]) + AC_CONFIG_SRCDIR([minizip.c]) + AM_INIT_AUTOMAKE([foreign]) + LT_INIT +-- +2.18.4 + diff --git a/binutils.spec b/binutils.spec index de1e0df..4848910 100644 --- a/binutils.spec +++ b/binutils.spec @@ -24,6 +24,7 @@ # /usr/bin/aarch64-linux-gnu-ar # /usr/bin/aarch64-linux-gnu-as # [etc] +%define anolis_release .0.1 %if 0%{!?binutils_target:1} @@ -43,7 +44,7 @@ Summary: A GNU collection of binary utilities Name: binutils%{?name_cross}%{?_with_debug:-debug} Version: 2.30 -Release: 113%{?dist} +Release: 113%{anolis_release}%{?dist} License: GPLv3+ URL: https://sourceware.org/binutils @@ -611,6 +612,9 @@ Patch96: binutils-undefined-unversioned-symbols.patch # Lifetime: Fixed in 2.35 Patch97: binutils-plugin-error.patch +#Add by Anolis +Patch1000: 0001-binutils-anolis-rebrand.patch +#end #---------------------------------------------------------------------------- Provides: bundled(libiberty) @@ -845,6 +849,7 @@ using libelf instead of BFD. %patch95 -p1 %patch96 -p1 %patch97 -p1 +%patch1000 -p1 # We cannot run autotools as there is an exact requirement of autoconf-2.59. # FIXME - this is no longer true. Maybe try reinstating autotool use ? @@ -1005,7 +1010,7 @@ export LDFLAGS=$RPM_LD_FLAGS %endif $CARGS \ --enable-plugins \ - --with-bugurl=http://bugzilla.redhat.com/bugzilla/ + --with-bugurl=https://bugzilla.openanolis.cn %if %{with docs} %make_build %{_smp_mflags} tooldir=%{_prefix} all @@ -1294,6 +1299,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Wed Apr 13 2022 Xue haolin - 2.30-113.0.1 +- Rebrand to Anolis OS. + * Wed Jan 19 2022 Nick Clifton - 2.30-113 - When searching for plugins, do not complain if incompatible ones are found. (#2039117) -- Gitee