Skip to contentSkip to conversation

package/ogre: bump to version 1.12.9

PATCH New Romain Naour 3 participants 17 messages Dec 7, 2020 – Jan 4, 2021 RISC-V

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 package/ogre: bump to version 1.12.9

Remove upstream patch [1].

tinyxml has been replaced by pugixml [2].

Switch to git download method since github release without the complete source code in the tarball [3].

Update indentation of hash file (two spaces).

The sdl2-config.cmake generated by sdl2 package is broken for cross-compilation since it add /usr/include/SDL2 in CFLAGS.

Such flags are unsafe for cross-compilation since it mixes headers for the host and target.

sdl2-config.cmake must be removed from staging since we are using autotools build system to build sdl2 package [4][5].

ogre 1.12.7 only include <sys/sysctl.h> for iOS in order to build with glibc >= 2.32 [6].

[1] https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca
[2] https://github.com/OGRECave/ogre/commit/338103324096b78ae4718f97ac2150c4bb98c2d1
[3] https://github.com/OGRECave/ogre/issues/1332#issuecomment-563189058
[4] https://bugzilla.libsdl.org/show_bug.cgi?id=4597
[5] https://github.com/OGRECave/ogre/issues/1568
[6] https://github.com/OGRECave/ogre/commit/8ec086e9bc2e24fab373b514c572483b69071d69

---
 ...ompiledHeader.cmake-Add-c-argument-t.patch | 57 -------------------
 package/ogre/Config.in                        |  1 +
 package/ogre/ogre.hash                        |  4 +-
 package/ogre/ogre.mk                          | 14 +++--
 4 files changed, 13 insertions(+), 63 deletions(-)
 delete mode 100644 package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch
package/ogre/0001-CMake-Utils-PrecompiledHeader.cmake-Add-c-argument-t.patch deleted +0 -57
deleted file mode 100644
index 97f4e24890..0000000000
@@ -1,57 +0,0 @@
-From f480ac538eb69086d4b7db855c2a457d5d6420d4 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <[email protected]>
-Date: Mon, 10 Feb 2020 14:05:12 +0100
-Subject: [PATCH] CMake/Utils/PrecompiledHeader.cmake: Add -c argument to build
- precompiled headers
-
-Add "-c" argument when building precompiled headers to fix build with
-RELRO.
-
-More information on a similar issue with domoticz can be found here:
-https://patchwork.ozlabs.org/patch/1187328:
-
-"The problem AFAICS is that if no -c or similar option is given, GCC
-decides what needs to be done based on the rest of the arguments. If the
-rest of the arguments include a -Wl,... option, it decides that linking
-needs to be done. If the rest of the arguments are just header files, it
-decides to create a precompiled header."
-
-Fixes:
- - http://autobuild.buildroot.org/results/8fabf8d270b9257c3a9db6a2f17f1c08ec9428d3
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Upstream: https://github.com/OGRECave/ogre/commit/de4d5c920e23e1e2b21dc5c8192ef74ba6210cca]
----
- CMake/Utils/PrecompiledHeader.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake
-index a02d99acd..bfb0059db 100644
---- a/CMake/Utils/PrecompiledHeader.cmake
-+++ b/CMake/Utils/PrecompiledHeader.cmake
-@@ -133,11 +133,11 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _output)
-             STRING(REGEX REPLACE "^ +" "" pchsupport_compiler_cxx_arg1 ${CMAKE_CXX_COMPILER_ARG1})
- 
-             SET(${out_command}
--              ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
-+              ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}
-               )
-         ELSE(CMAKE_CXX_COMPILER_ARG1)
-             SET(${out_command}
--              ${CMAKE_CXX_COMPILER}  ${_compile_FLAGS} -x c++-header -o ${_output} ${_input}
-+              ${CMAKE_CXX_COMPILER}  ${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}
-               )
-         ENDIF(CMAKE_CXX_COMPILER_ARG1)
-     ELSE(CMAKE_COMPILER_IS_GNUCXX)
-@@ -291,7 +291,7 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _input)
-     set_target_properties(${_targetName}_pch_dephelp PROPERTIES INCLUDE_DIRECTORIES "${DIRINC}")
- 
-     #MESSAGE("_compile_FLAGS: ${_compile_FLAGS}")
--    #message("COMMAND ${CMAKE_CXX_COMPILER}	${_compile_FLAGS} -x c++-header -o ${_output} ${_input}")
-+    #message("COMMAND ${CMAKE_CXX_COMPILER}	${_compile_FLAGS} -x c++-header -c -o ${_output} ${_input}")
- 
-     ADD_CUSTOM_COMMAND(
-       OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${_name}"
--- 
-2.24.1
-
package/ogre/Config.in +1 -0
index 1d7784714d..7d57d3f82a 100644
@@ -10,6 +10,7 @@ config BR2_PACKAGE_OGRE
 	depends on BR2_USE_WCHAR # use wchar_t
 	select BR2_PACKAGE_FREETYPE
 	select BR2_PACKAGE_LIBFREEIMAGE
+	select BR2_PACKAGE_PUGIXML
 	select BR2_PACKAGE_SDL2
 	select BR2_PACKAGE_SDL2_OPENGL
 	select BR2_PACKAGE_SDL2_X11 # use wmInfo.info.x11
package/ogre/ogre.hash +2 -2
index 8bb4ae96a1..c1ac4e8925 100644
@@ -1,3 +1,3 @@
 # sha256 locally computed
-sha256 163e7700e319532d4389ecba91e3ab88551f78610886fa36f8f262f9a5080988  ogre-1.12.0.tar.gz
-sha256 82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8  LICENSE
+sha256  d07342016fbb4b6a4158cb12724c2c75b406eea2c5327dd48d9302cf812df8ba  ogre-v1.12.9.tar.gz
+sha256  82758e8d1d72139904b9b7472ef0f6544413d2871b58540307fdcc20e473e5f8  LICENSE
package/ogre/ogre.mk +10 -4
index 2df685a23a..52bd3b32d2 100644
@@ -4,17 +4,21 @@
 #
 ################################################################################
 
-OGRE_VERSION = 1.12.0
-OGRE_SITE = $(call github,OGRECave,ogre,v$(OGRE_VERSION))
-OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins), Zlib (tinyxml)
+OGRE_VERSION = v1.12.9
+OGRE_SITE = https://github.com/OGRECave/ogre
+OGRE_SITE_METHOD = git
+OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins)
 OGRE_LICENSE_FILES = LICENSE
 OGRE_INSTALL_STAGING = YES
 
-# Ogre use a bundled version of tinyxml
+# Download with imgui submodule (https://github.com/ocornut/imgui
+OGRE_GIT_SUBMODULES = YES
+
 OGRE_DEPENDENCIES = host-pkgconf \
 	freetype \
 	libfreeimage \
 	libgl \
+	pugixml \
 	sdl2 \
 	xlib_libX11 \
 	xlib_libXaw \
@@ -27,9 +31,11 @@ OGRE_CXXFLAGS = $(TARGET_CXXFLAGS) -DGLEW_NO_GLU
 
 # Unbundle freetype and zziplib.
 # Disable java and nvidia cg support.
+# Disable imgui overlay to avoid extra download from CMake.
 OGRE_CONF_OPTS = -DOGRE_BUILD_DEPENDENCIES=OFF \
 	-DOGRE_BUILD_COMPONENT_JAVA=OFF \
 	-DOGRE_BUILD_PLUGIN_CG=OFF \
+	-DOGRE_BUILD_COMPONENT_OVERLAY_IMGUI=OFF \
 	-DOGRE_INSTALL_DOCS=OFF \
 	-DCMAKE_C_FLAGS="$(OGRE_CFLAGS)" \
 	-DCMAKE_CXX_FLAGS="$(OGRE_CXXFLAGS)"
Signature · 1 line
2.25.4
#1 lore raw

PATCH 2/5 support/scripts/gen-bootlin-toolchains: riscv32 use a pre-2.33 glibc version without RPC support

riscv32 has been merged into glibc 2.33 where RPC support has been removed [1].

Add a special handling for the riscv32 Bootlin bleeding-edge 2020.08-1 toolchain since it used a pre-2.33 glibc version [2].

Other glibc Bootlin toolchain use glibc 2.31 with RPC support enabled.

This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html
[2] https://git.buildroot.net/buildroot/commit/?id=a4889545aa653e7f001f212eda169e7d676aefc0

Cc Thomas Petazzoni <[email protected]>
---
 support/scripts/gen-bootlin-toolchains | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
support/scripts/gen-bootlin-toolchains +5 -2
index fce75c51c2..645584d07e 100755
@@ -263,8 +263,11 @@ class Toolchain:
                 # glibc doesn't support static only configuration
                 depends.append("!BR2_STATIC_LIBS")
                 selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC")
-                # all glibc toolchains have RPC support
-                selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")
+
+                # riscv32 has been merged into glibc 2.33 where RPC support has been removed.
+                if not self.arch.startswith("riscv32"):
+                    # all glibc < 2.32 toolchains have RPC support
+                    selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")
             elif frag.startswith("BR2_TOOLCHAIN_EXTERNAL_CUSTOM_MUSL"):
                 # musl needs mmu support
                 depends.append("BR2_USE_MMU")
Signature · 1 line
2.25.4
#2 lore raw

PATCH 2/5 support/scripts/gen-bootlin-toolchains: riscv32 use a pre-2.33 glibc version without RPC support

Hello,

Quoted 24 lines · On Mon, 7 Dec 2020 21:48:18 +0100 Romain Naour <[email protected]> wrote:

riscv32 has been merged into glibc 2.33 where RPC support has been removed [1].

Add a special handling for the riscv32 Bootlin bleeding-edge 2020.08-1 toolchain since it used a pre-2.33 glibc version [2].

Other glibc Bootlin toolchain use glibc 2.31 with RPC support enabled.

This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html
[2] https://git.buildroot.net/buildroot/commit/?id=a4889545aa653e7f001f212eda169e7d676aefc0

Cc Thomas Petazzoni <[email protected]>
---
 support/scripts/gen-bootlin-toolchains | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
support/scripts/gen-bootlin-toolchains +0 -0
index fce75c51c2..645584d07e 100755

support/scripts/gen-bootlin-toolchains class Toolchain: · line 270

Quoted 10 lines
support/scripts/gen-bootlin-toolchains +5 -2
@@ -263,8 +263,11 @@ class Toolchain:
                 # glibc doesn't support static only configuration
                 depends.append("!BR2_STATIC_LIBS")
                 selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC")
-                # all glibc toolchains have RPC support
-                selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")
+
+                # riscv32 has been merged into glibc 2.33 where RPC support has been removed.
+                if not self.arch.startswith("riscv32"):
+                    # all glibc < 2.32 toolchains have RPC support
+                    selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")

I am not convinced by this approach, as it doesn't work when glibc 2.33 gets used for other platforms than RISC-V 32. Instead, what we need to do is:

(1) Fix how toolchains.bootlin.com generates its fragments to no

     longer assume that glibc == RPC available.

(2) Fix the gen-bootlin-toolchains script to also no longer assume that glibc == RPC available, and instead use what the fragment provided by toolchains.bootlin.com for each toolchain says.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 2/5 support/scripts/gen-bootlin-toolchains: riscv32 use a pre-2.33 glibc version without RPC support

Hello,

Le 07/12/2020 ? 22:50, Thomas Petazzoni a ?crit?:

Quoted 43 lines

Hello,

Quoted 24 lines · On Mon, 7 Dec 2020 21:48:18 +0100 Romain Naour <[email protected]> wrote:

riscv32 has been merged into glibc 2.33 where RPC support has been removed [1].

Add a special handling for the riscv32 Bootlin bleeding-edge 2020.08-1 toolchain since it used a pre-2.33 glibc version [2].

Other glibc Bootlin toolchain use glibc 2.31 with RPC support enabled.

This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html
[2] https://git.buildroot.net/buildroot/commit/?id=a4889545aa653e7f001f212eda169e7d676aefc0

Cc Thomas Petazzoni <[email protected]>
---
 support/scripts/gen-bootlin-toolchains | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
support/scripts/gen-bootlin-toolchains +0 -0
index fce75c51c2..645584d07e 100755

support/scripts/gen-bootlin-toolchains class Toolchain: · line 270

Quoted 10 lines
support/scripts/gen-bootlin-toolchains +5 -2
@@ -263,8 +263,11 @@ class Toolchain:
                 # glibc doesn't support static only configuration
                 depends.append("!BR2_STATIC_LIBS")
                 selects.append("BR2_TOOLCHAIN_EXTERNAL_GLIBC")
-                # all glibc toolchains have RPC support
-                selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")
+
+                # riscv32 has been merged into glibc 2.33 where RPC support has been removed.
+                if not self.arch.startswith("riscv32"):
+                    # all glibc < 2.32 toolchains have RPC support
+                    selects.append("BR2_TOOLCHAIN_HAS_NATIVE_RPC")

I am not convinced by this approach, as it doesn't work when glibc 2.33 gets used for other platforms than RISC-V 32. Instead, what we need to do is:

Quoted 2 lines

(1) Fix how toolchains.bootlin.com generates its fragments to no

     longer assume that glibc == RPC available.

Agree, but what about existing fragments ? They doesn't provide information about RPC support. We need to patch them to add BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y like in the next patch.

Quoted 4 lines

(2) Fix the gen-bootlin-toolchains script to also no longer assume that glibc == RPC available, and instead use what the fragment provided by toolchains.bootlin.com for each toolchain says.

Agree but the generated toolchain-external-bootlin will be wrong about RPC with the current fragments.

What do you suggest to fix them ?

Best regards,
Romain

Quoted 5 lines

Best regards,

Thomas

#4 lore raw

PATCH 2/5 support/scripts/gen-bootlin-toolchains: riscv32 use a pre-2.33 glibc version without RPC support

Hello,

Quoted 9 lines · On Mon, 7 Dec 2020 23:30:42 +0100 Romain Naour <[email protected]> wrote:
Quoted 5 lines

I am not convinced by this approach, as it doesn't work when glibc 2.33 gets used for other platforms than RISC-V 32. Instead, what we need to do is:

(1) Fix how toolchains.bootlin.com generates its fragments to no

     longer assume that glibc == RPC available.  

Agree, but what about existing fragments ? They doesn't provide information about RPC support. We need to patch them to add BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y like in the next patch.

I would obviously fix the existing fragments. I already fixed fragments to address other issues in the past.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#5 lore raw

PATCH 2/5 support/scripts/gen-bootlin-toolchains: riscv32 use a pre-2.33 glibc version without RPC support

In reply to Romain Naour
Quoted 10 lines · On Mon, 7 Dec 2020 21:48:18 +0100 Romain Naour <[email protected]> wrote:

riscv32 has been merged into glibc 2.33 where RPC support has been removed [1].

Add a special handling for the riscv32 Bootlin bleeding-edge 2020.08-1 toolchain since it used a pre-2.33 glibc version [2].

Other glibc Bootlin toolchain use glibc 2.31 with RPC support enabled.

This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.

Quoted 8 lines

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html
[2] https://git.buildroot.net/buildroot/commit/?id=a4889545aa653e7f001f212eda169e7d676aefc0

Cc Thomas Petazzoni <[email protected]>
---
 support/scripts/gen-bootlin-toolchains | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

So, as discussed, this approach was not really great. Instead, I've merged your pull request on toolchains-builder, and manually fixed up the existing toolchain fragments (for the latest glibc toolchains) so that they carry the proper RPC information. Then, I applied
https://git.buildroot.org/buildroot/commit/?id=8cba5463deb263e1581895a58fef089e8ec02380
to gen-bootlin-toolchains to leverage this correct information in the fragments.

So I've marked this particular patch of yours as Rejected.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#6 lore raw

PATCH 3/5 toolchain/toolchain-external/toolchain-external-bootlin: regenerate for riscv32 toolchain

In reply to Romain Naour

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/849510531

---
 .../toolchain-external-bootlin/Config.in.options                 | 1 -
 1 file changed, 1 deletion(-)
toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options +0 -1
index 3c94ae1535..be9c204193 100644
@@ -3331,7 +3331,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV32_ILP32D_GLIBC_BLEEDING_EDGE
 	select BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	select BR2_TOOLCHAIN_EXTERNAL_GLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  Bootlin toolchain for the riscv32-ilp32d architecture,
 	  using the glibc C library. This is a bleeding-edge version,
Signature · 1 line
2.25.4
#7 lore raw

PATCH 3/5 toolchain/toolchain-external/toolchain-external-bootlin: regenerate for riscv32 toolchain

Quoted 7 lines · On Mon, 7 Dec 2020 21:48:19 +0100 Romain Naour <[email protected]> wrote:

Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/849510531

---
 .../toolchain-external-bootlin/Config.in.options                 | 1 -
 1 file changed, 1 deletion(-)

Applied as
https://git.buildroot.org/buildroot/commit/?id=e74cdd07a33785ca2c16b3ec394d41ceaf1f1aeb.
Even though our change to gen-bootlin-toolchains is different, the resulting effect for the RISC-V 32-bit toolchain was the same with this commit, so applied to master!

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#8 lore raw

PATCH 4/5 support/{config-fragments, testing}: select INET_RPC option for custom glibc external toolchains

In reply to Romain Naour

The sun rpc support has been removed from glibc 2.32 [1], so BR2_TOOLCHAIN_EXTERNAL_INET_RPC will no longer be enabled by default for custom external toolchains.

Add this option in config fragments used by autobuild and testing scripts.

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html

Cc Thomas Petazzoni <[email protected]>
---
 support/config-fragments/autobuild/bootlin-x86-64-glibc.config  | 1 +
 support/config-fragments/autobuild/br-aarch64-glibc.config      | 1 +
 .../config-fragments/autobuild/br-arm-cortex-a9-glibc.config    | 1 +
 .../config-fragments/autobuild/br-mips32r6-el-hf-glibc.config   | 1 +
 .../config-fragments/autobuild/br-mips64r6-el-hf-glibc.config   | 1 +
 support/config-fragments/autobuild/br-nios2-glibc.config        | 1 +
 .../config-fragments/autobuild/br-powerpc64-power7-glibc.config | 1 +
 .../autobuild/br-powerpc64le-power8-glibc.config                | 1 +
 support/config-fragments/autobuild/br-riscv32.config            | 1 +
 support/config-fragments/autobuild/br-riscv64.config            | 1 +
 support/config-fragments/autobuild/br-sparc64-glibc.config      | 1 +
 support/testing/tests/boot/test_syslinux.py                     | 2 ++
 support/testing/tests/core/test_hardening.py                    | 1 +
 support/testing/tests/package/test_glxinfo.py                   | 1 +
 14 files changed, 15 insertions(+)
support/config-fragments/autobuild/bootlin-x86-64-glibc.config +1 -0
index 6a372803b2..d9a4111fd8 100644
@@ -13,3 +13,4 @@ BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG=y
 BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS=y
 BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_NPTL=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
support/config-fragments/autobuild/br-aarch64-glibc.config +1 -0
index f1b0f2a91e..525af58ee4 100644
@@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-arm-cortex-a9-glibc.config +1 -0
index a3b51138d7..4a06d360c8 100644
@@ -8,4 +8,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_9=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-mips32r6-el-hf-glibc.config +1 -0
index ce61100a37..a9993a7dda 100644
@@ -8,4 +8,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-mips64r6-el-hf-glibc.config +1 -0
index 48ed24dacf..d748250f61 100644
@@ -9,4 +9,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-nios2-glibc.config +1 -0
index c5ac68dc50..9260f72a7f 100644
@@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-powerpc64-power7-glibc.config +1 -0
index 5d7171a067..1206f34cb2 100644
@@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-powerpc64le-power8-glibc.config +1 -0
index b743bbc4a0..5c7a75726c 100644
@@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-riscv32.config +1 -0
index d9110a6a86..2fe9397b3a 100644
@@ -6,4 +6,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_19=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-riscv64.config +1 -0
index c5df86392c..2b1d4ce603 100644
@@ -5,4 +5,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.net/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_5_4=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/config-fragments/autobuild/br-sparc64-glibc.config +1 -0
index 0b77bb45fa..ca50240729 100644
@@ -5,4 +5,5 @@ BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/b
 BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
 BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
 BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
 BR2_TOOLCHAIN_EXTERNAL_CXX=y
support/testing/tests/boot/test_syslinux.py +2 -0
index 467d564e18..5a9946dc4d 100644
@@ -12,6 +12,7 @@ class TestSysLinuxBase(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
         BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
         BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+        BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
         BR2_TOOLCHAIN_EXTERNAL_CXX=y
         """
 
@@ -28,6 +29,7 @@ class TestSysLinuxBase(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL_CXX=y
         BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
         BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+        BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
         """
 
     syslinux_legacy_config = \
support/testing/tests/core/test_hardening.py +1 -0
index 60e14303a3..b9ed8329c8 100644
@@ -16,6 +16,7 @@ class TestHardeningBase(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL_GCC_6=y
         BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
         BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+        BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
         BR2_TOOLCHAIN_EXTERNAL_CXX=y
         BR2_PACKAGE_LIGHTTPD=y
         BR2_PACKAGE_HOST_CHECKSEC=y
support/testing/tests/package/test_glxinfo.py +1 -0
index f37236d161..9edd6926b6 100644
@@ -18,6 +18,7 @@ class TestGlxinfo(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL_CXX=y
         BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
         BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+        BR2_TOOLCHAIN_EXTERNAL_INET_RPC=y
         BR2_LINUX_KERNEL=y
         BR2_LINUX_KERNEL_CUSTOM_VERSION=y
         BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7"
Signature · 1 line
2.25.4
#9 lore raw

PATCH 4/5 support/{config-fragments, testing}: select INET_RPC option for custom glibc external toolchains

Quoted 2 lines · On Mon, 7 Dec 2020 21:48:20 +0100 Romain Naour <[email protected]> wrote:

The sun rpc support has been removed from glibc 2.32 [1], so BR2_TOOLCHAIN_EXTERNAL_INET_RPC will no longer be enabled by default for custom external toolchains.

Here you're saying "removed from glibc 2.32", but in a previous commit, you say:

"""
This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.
"""

I think this is somewhat confusing. Indeed, RPC has been removed from glibc 2.32, so your previous commit should have said:

"""
This special handling must be removed when all Bootlin toolchain has been rebuild with glibc >= 2.32.
"""

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#10 lore raw

PATCH 4/5 support/{config-fragments, testing}: select INET_RPC option for custom glibc external toolchains

Le 07/12/2020 ? 22:52, Thomas Petazzoni a ?crit?:

Quoted 13 lines
Quoted 2 lines · On Mon, 7 Dec 2020 21:48:20 +0100 Romain Naour <[email protected]> wrote:

The sun rpc support has been removed from glibc 2.32 [1], so BR2_TOOLCHAIN_EXTERNAL_INET_RPC will no longer be enabled by default for custom external toolchains.

Here you're saying "removed from glibc 2.32", but in a previous commit, you say:

"""
This special handling must be removed when all Bootlin toolchain has been rebuild with glibc > 2.32.
"""

Quoted 7 lines

I think this is somewhat confusing. Indeed, RPC has been removed from glibc 2.32, so your previous commit should have said:

"""
This special handling must be removed when all Bootlin toolchain has been rebuild with glibc >= 2.32.
"""

This is a typo, maybe ? :)

Nice catch!

Best regards,
Romain

Quoted 3 lines

Thomas

#11 lore raw

PATCH 4/5 support/{config-fragments, testing}: select INET_RPC option for custom glibc external toolchains

In reply to Romain Naour
Quoted 9 lines · On Mon, 7 Dec 2020 21:48:20 +0100 Romain Naour <[email protected]> wrote:

The sun rpc support has been removed from glibc 2.32 [1], so BR2_TOOLCHAIN_EXTERNAL_INET_RPC will no longer be enabled by default for custom external toolchains.

Add this option in config fragments used by autobuild and testing scripts.

[1] https://sourceware.org/pipermail/libc-announce/2020/000029.html

Cc Thomas Petazzoni <[email protected]>
Quoted 16 lines
---
 support/config-fragments/autobuild/bootlin-x86-64-glibc.config  | 1 +
 support/config-fragments/autobuild/br-aarch64-glibc.config      | 1 +
 .../config-fragments/autobuild/br-arm-cortex-a9-glibc.config    | 1 +
 .../config-fragments/autobuild/br-mips32r6-el-hf-glibc.config   | 1 +
 .../config-fragments/autobuild/br-mips64r6-el-hf-glibc.config   | 1 +
 support/config-fragments/autobuild/br-nios2-glibc.config        | 1 +
 .../config-fragments/autobuild/br-powerpc64-power7-glibc.config | 1 +
 .../autobuild/br-powerpc64le-power8-glibc.config                | 1 +
 support/config-fragments/autobuild/br-riscv32.config            | 1 +
 support/config-fragments/autobuild/br-riscv64.config            | 1 +
 support/config-fragments/autobuild/br-sparc64-glibc.config      | 1 +
 support/testing/tests/boot/test_syslinux.py                     | 2 ++
 support/testing/tests/core/test_hardening.py                    | 1 +
 support/testing/tests/package/test_glxinfo.py                   | 1 +
 14 files changed, 15 insertions(+)

We are going to keep BR2_TOOLCHAIN_EXTERNAL_INET_RPC default to yes with glibc for the moment, so I've marked this patch as Rejected.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#12 lore raw

PATCH 5/5 package/glibc: bump to version 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2

In reply to Romain Naour

- Support for Synopsys ARC HS cores (ARCv2 ISA) running Linux has been added. Remove the ARC specific version.

- Remove --enable-obsolete-rpc configure option.

- toolchain: don't enable RPC unconditionally since it was removed from glibc No need to update packaged external toolchains since they already select BR2_TOOLCHAIN_HAS_NATIVE_RPC.

- All config fragments using a custom external toolchain has been updated by a previous commit to select BR2_TOOLCHAIN_EXTERNAL_INET_RPC.

- Existing packages that requires rpc support can already fallback to libtirpc when BR2_TOOLCHAIN_HAS_NATIVE_RPC is set (musl and uClibc-ng).

See:
https://sourceware.org/pipermail/libc-announce/2020/000029.html

Cc Thomas Petazzoni <[email protected]>

---
v2: update to 2.32-24
remove CVE from release note (Peter)

---
 .../glibc.hash                                           | 7 -------
 .../glibc.hash                                           | 2 +-
 package/glibc/glibc.mk                                   | 9 ++-------
 .../0001-HACK-only-build-and-install-localedef.patch     | 0
 ...x-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0
 .../localedef.hash                                       | 2 +-
 package/localedef/localedef.mk                           | 2 +-
 toolchain/toolchain-buildroot/Config.in                  | 2 --
 .../toolchain-external-custom/Config.in.options          | 1 -
 9 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash
 rename package/glibc/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/glibc.hash (70%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0001-HACK-only-build-and-install-localedef.patch (100%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/localedef.hash (70%)
package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash deleted +0 -7
deleted file mode 100644
index c6259a4745..0000000000
@@ -1,7 +0,0 @@
-# Locally calculated (fetched from Github)
-sha256  07f3804abbc6a23315f09568686c0e5bb81d714251cf537d25a36f826cae540b  glibc-2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5.tar.gz
-
-# Hashes for license files
-sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
-sha256  b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc  LICENSES
package/glibc/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/glibc.hash renamed from package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash +1 -1
similarity index 70%
rename from package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash
rename to package/glibc/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/glibc.hash
index a1b2ae12fd..45ecc2895f 100644
@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176  glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz
+sha256  04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d  glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/glibc/glibc.mk +2 -7
index 4721177d83..b5c70a3007 100644
@@ -11,16 +11,12 @@ else
 # Generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
 # When updating the version, please also update localedef
-ifeq ($(BR2_arc),y)
-# ARC support in upstream was merged in 2.32 release
-# This can be removed once BR upgrades to 2.32 or later
-GLIBC_VERSION = 2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5
-else ifeq ($(BR2_RISCV_32),y)
+ifeq ($(BR2_RISCV_32),y)
 # RISC-V 32-bit (RV32) requires glibc 2.33 or newer
 # Until 2.33 is released, just use master
 GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99
 else
-GLIBC_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d
+GLIBC_VERSION = 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2
 endif
 # Upstream doesn't officially provide an https download link.
 # There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
@@ -137,7 +133,6 @@ define GLIBC_CONFIGURE_CMDS
 		--disable-profile \
 		--disable-werror \
 		--without-gd \
-		--enable-obsolete-rpc \
 		--enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \
 		--with-headers=$(STAGING_DIR)/usr/include)
 	$(GLIBC_ADD_MISSING_STUB_H)
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch +0 -0
similarity index 100%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +0 -0
similarity index 100%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash +1 -1
similarity index 70%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash
index a1b2ae12fd..45ecc2895f 100644
@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176  glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz
+sha256  04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d  glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/localedef/localedef.mk +1 -1
index 413e3acb65..d75702d847 100644
@@ -7,7 +7,7 @@
 # Use the same VERSION and SITE as target glibc
 # As in glibc.mk, generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
-LOCALEDEF_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d
+LOCALEDEF_VERSION = 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2
 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
 LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
 HOST_LOCALEDEF_DL_SUBDIR = glibc
toolchain/toolchain-buildroot/Config.in +0 -2
index 25ac9759f1..e46477dbaa 100644
@@ -58,8 +58,6 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 	depends on !BR2_powerpc_SPE
 	depends on BR2_RISCV_ISA_RVA || !BR2_riscv
 	select BR2_TOOLCHAIN_USES_GLIBC
-	# our glibc.mk enables RPC support
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  This option selects glibc as the C library for the
 	  cross-compilation toolchain.
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +0 -1
index f7aa5454e3..14046739d5 100644
@@ -448,7 +448,6 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
-	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
Signature · 1 line
2.25.4
#13 lore raw

PATCH 5/5 package/glibc: bump to version 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2

Romain, All,

On 2020-12-07 21:48 +0100, Romain Naour spake thusly:

Quoted 12 lines

- Support for Synopsys ARC HS cores (ARCv2 ISA) running Linux has been added. Remove the ARC specific version.

- Remove --enable-obsolete-rpc configure option.

- toolchain: don't enable RPC unconditionally since it was removed from glibc No need to update packaged external toolchains since they already select BR2_TOOLCHAIN_HAS_NATIVE_RPC.

- All config fragments using a custom external toolchain has been updated by a previous commit to select BR2_TOOLCHAIN_EXTERNAL_INET_RPC.

Quoted 8 lines

- Existing packages that requires rpc support can already fallback to libtirpc when BR2_TOOLCHAIN_HAS_NATIVE_RPC is set (musl and uClibc-ng).

See:
https://sourceware.org/pipermail/libc-announce/2020/000029.html

Cc Thomas Petazzoni <[email protected]>

With Thomas, we've slightly reworked and split that patch:

- fisrt patch to stop using the obosolete RPC
- second patch to bump to 2.32 in the generic case
- third patch to drop the custom ARC version

Thanks a lot for initiating this hard work! :-)

Appied to master,now (when is 2.33 supposed to get out, now? ;-] )

Quoted 2 lines

---
v2: update to 2.32-24

You almost got me there: this patch uses 2.32-23, not 24. Pfeww, I got a cold sweat for a few seconds... ;-)

Regards,
Yann E. MORIN.

Quoted 143 lines

remove CVE from release note (Peter)

---
 .../glibc.hash                                           | 7 -------
 .../glibc.hash                                           | 2 +-
 package/glibc/glibc.mk                                   | 9 ++-------
 .../0001-HACK-only-build-and-install-localedef.patch     | 0
 ...x-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch | 0
 .../localedef.hash                                       | 2 +-
 package/localedef/localedef.mk                           | 2 +-
 toolchain/toolchain-buildroot/Config.in                  | 2 --
 .../toolchain-external-custom/Config.in.options          | 1 -
 9 files changed, 5 insertions(+), 20 deletions(-)
 delete mode 100644 package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash
 rename package/glibc/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/glibc.hash (70%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0001-HACK-only-build-and-install-localedef.patch (100%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch (100%)
 rename package/localedef/{2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d => 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2}/localedef.hash (70%)
package/glibc/2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5/glibc.hash deleted +0 -7
deleted file mode 100644
index c6259a4745..0000000000
@@ -1,7 +0,0 @@
-# Locally calculated (fetched from Github)
-sha256  07f3804abbc6a23315f09568686c0e5bb81d714251cf537d25a36f826cae540b  glibc-2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5.tar.gz
-
-# Hashes for license files
-sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
-sha256  dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551  COPYING.LIB
-sha256  b33d0bd9f685b46853548814893a6135e74430d12f6d94ab3eba42fc591f83bc  LICENSES
package/glibc/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/glibc.hash renamed from package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash +1 -1
similarity index 70%
rename from package/glibc/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/glibc.hash
rename to package/glibc/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/glibc.hash
index a1b2ae12fd..45ecc2895f 100644
@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176  glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz
+sha256  04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d  glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/glibc/glibc.mk +2 -7
index 4721177d83..b5c70a3007 100644
@@ -11,16 +11,12 @@ else
 # Generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
 # When updating the version, please also update localedef
-ifeq ($(BR2_arc),y)
-# ARC support in upstream was merged in 2.32 release
-# This can be removed once BR upgrades to 2.32 or later
-GLIBC_VERSION = 2.32-2-g386543bc4495f658dcce6cd4d11e4ba6574a46f5
-else ifeq ($(BR2_RISCV_32),y)
+ifeq ($(BR2_RISCV_32),y)
 # RISC-V 32-bit (RV32) requires glibc 2.33 or newer
 # Until 2.33 is released, just use master
 GLIBC_VERSION = 2.32.9000-69-gbd394d131c10c9ec22c6424197b79410042eed99
 else
-GLIBC_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d
+GLIBC_VERSION = 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2
 endif
 # Upstream doesn't officially provide an https download link.
 # There is one (https://sourceware.org/git/glibc.git) but it's not reliable,
@@ -137,7 +133,6 @@ define GLIBC_CONFIGURE_CMDS
 		--disable-profile \
 		--disable-werror \
 		--without-gd \
-		--enable-obsolete-rpc \
 		--enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \
 		--with-headers=$(STAGING_DIR)/usr/include)
 	$(GLIBC_ADD_MISSING_STUB_H)
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch +0 -0
similarity index 100%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0001-HACK-only-build-and-install-localedef.patch
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0001-HACK-only-build-and-install-localedef.patch
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch +0 -0
similarity index 100%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/0002-relax-dependency-on-GCC-to-4.8-and-binutils-to-2.24.patch
package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash renamed from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash +1 -1
similarity index 70%
rename from package/localedef/2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d/localedef.hash
rename to package/localedef/2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2/localedef.hash
index a1b2ae12fd..45ecc2895f 100644
@@ -1,5 +1,5 @@
 # Locally calculated (fetched from Github)
-sha256  e1f2c9b424a4e0c00e7ad123a4204f7bc8afd3c504aeb8c79b1086509fd67176  glibc-2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d.tar.gz
+sha256  04946bb7cbaf4062bf5e727e0d6784e105b07611587d71f00d25ea896753c26d  glibc-2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2.tar.gz
 
 # Hashes for license files
 sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  COPYING
package/localedef/localedef.mk +1 -1
index 413e3acb65..d75702d847 100644
@@ -7,7 +7,7 @@
 # Use the same VERSION and SITE as target glibc
 # As in glibc.mk, generate version string using:
 #   git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
-LOCALEDEF_VERSION = 2.31-54-g6fdf971c9dbf7dac9bea552113fe4694015bbc4d
+LOCALEDEF_VERSION = 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2
 LOCALEDEF_SOURCE = glibc-$(LOCALEDEF_VERSION).tar.gz
 LOCALEDEF_SITE = $(call github,bminor,glibc,$(LOCALEDEF_VERSION))
 HOST_LOCALEDEF_DL_SUBDIR = glibc
toolchain/toolchain-buildroot/Config.in +0 -2
index 25ac9759f1..e46477dbaa 100644
@@ -58,8 +58,6 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
 	depends on !BR2_powerpc_SPE
 	depends on BR2_RISCV_ISA_RVA || !BR2_riscv
 	select BR2_TOOLCHAIN_USES_GLIBC
-	# our glibc.mk enables RPC support
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
 	  This option selects glibc as the C library for the
 	  cross-compilation toolchain.
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +0 -1
index f7aa5454e3..14046739d5 100644
@@ -448,7 +448,6 @@ config BR2_TOOLCHAIN_EXTERNAL_HAS_SSP_STRONG
 
 config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
 	bool "Toolchain has RPC support?"
-	default y if BR2_TOOLCHAIN_EXTERNAL_GLIBC
 	depends on !BR2_TOOLCHAIN_EXTERNAL_MUSL
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	help
Signature · 6 lines
2.25.4

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#14 lore raw

PATCH 5/5 package/glibc: bump to version 2.32-23-g050022910be1d1f5c11cd5168f1685ad4f9580d2

Quoted 1 line · On Tue, 29 Dec 2020 23:34:51 +0100 "Yann E. MORIN" <[email protected]>…

Appied to master,now (when is 2.33 supposed to get out, now? ;-] )

"The current development version of glibc 2.33, releasing on or around February 1st, 2021."

https://www.gnu.org/software/libc/

So 2.33 would be too late for Buildroot 2021.02, so moving to 2.32 now is a good plan IMO.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#15 lore raw

PATCH 1/5 package/ogre: bump to version 1.12.9

In reply to Romain Naour

Hello Romain,

Quoted 12 lines · On Mon, 7 Dec 2020 21:48:17 +0100 Romain Naour <[email protected]> wrote:

Remove upstream patch [1].

tinyxml has been replaced by pugixml [2].

Switch to git download method since github release without the complete source code in the tarball [3].

Update indentation of hash file (two spaces).

The sdl2-config.cmake generated by sdl2 package is broken for cross-compilation since it add /usr/include/SDL2 in CFLAGS.

Quoted 6 lines

Such flags are unsafe for cross-compilation since it mixes headers for the host and target.

sdl2-config.cmake must be removed from staging since we are using autotools build system to build sdl2 package [4][5].

I'm confused by all these explanations about sdl2-config.cmake, because they appear here in this patch... but there's nothing related to that in the patch. And in fact your sdl2-config.cmake fix has already been merged in commit d59261836a2ae2d024645b1e286540dd4269b6c8.

Quoted 2 lines

ogre 1.12.7 only include <sys/sysctl.h> for iOS in order to build with glibc >= 2.32 [6].

And? So what?

Quoted 1 line

+OGRE_VERSION = v1.12.9

We don't want the leading "v" in the version variable. I'm not sure how we handle that for git-based downloads. With <pkg>_DL_VERSION ?

package/ogre/ogre.mk line 14

Quoted 8 lines
package/ogre/ogre.mk +4 -1
+OGRE_SITE = https://github.com/OGRECave/ogre
+OGRE_SITE_METHOD = git
+OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins)
 OGRE_LICENSE_FILES = LICENSE
 OGRE_INSTALL_STAGING = YES
 
-# Ogre use a bundled version of tinyxml
+# Download with imgui submodule (https://github.com/ocornut/imgui

Missing closing parenthesis.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#16 lore raw

PATCH 1/5 package/ogre: bump to version 1.12.9

Hello Thomas,

Le 29/12/2020 ? 23:22, Thomas Petazzoni a ?crit?:

Quoted 20 lines

Hello Romain,

Quoted 15 lines · On Mon, 7 Dec 2020 21:48:17 +0100 Romain Naour <[email protected]> wrote:

Remove upstream patch [1].

tinyxml has been replaced by pugixml [2].

Switch to git download method since github release without the complete source code in the tarball [3].

Update indentation of hash file (two spaces).

The sdl2-config.cmake generated by sdl2 package is broken for cross-compilation since it add /usr/include/SDL2 in CFLAGS.

Such flags are unsafe for cross-compilation since it mixes headers for the host and target.

Quoted 8 lines
Quoted 3 lines

sdl2-config.cmake must be removed from staging since we are using autotools build system to build sdl2 package [4][5].

I'm confused by all these explanations about sdl2-config.cmake, because they appear here in this patch... but there's nothing related to that in the patch. And in fact your sdl2-config.cmake fix has already been merged in commit d59261836a2ae2d024645b1e286540dd4269b6c8.

Yes, this patch (2/2) was part of the series containing the sdl2-config.cmake fix. But only the first patch was applied d59261836a2ae2d024645b1e286540dd4269b6c8.

Quoted 5 lines
Quoted 3 lines

ogre 1.12.7 only include <sys/sysctl.h> for iOS in order to build with glibc >= 2.32 [6].

And? So what?

With the glibc version but the current ogre version (1.12.0) doesn't build due to <sys/sysctl.h>.

Quoted 6 lines
Quoted 3 lines

+OGRE_VERSION = v1.12.9

We don't want the leading "v" in the version variable. I'm not sure how we handle that for git-based downloads. With <pkg>_DL_VERSION ?

Maybe use the git hash instead?

Quoted 9 lines

package/ogre/ogre.mk line 14

Quoted 9 lines
package/ogre/ogre.mk +4 -1
+OGRE_SITE = https://github.com/OGRECave/ogre
+OGRE_SITE_METHOD = git
+OGRE_LICENSE = MIT (main library, DeferredShadingMedia samples), Public Domain (samples and plugins)
 OGRE_LICENSE_FILES = LICENSE
 OGRE_INSTALL_STAGING = YES
 
-# Ogre use a bundled version of tinyxml
+# Download with imgui submodule (https://github.com/ocornut/imgui

ok

Best regards,
Romain

Quoted 7 lines

Missing closing parenthesis.

Thanks!

Thomas