dev

dev@openadk.org

115 discussions

Static toolchain for x86_64 not building

by John Graham

I'm trying to build a static toolchain for x86_64, but I don't know what to do about the following error in the `toolchain/binutils/compile` stage - can anyone help? I made sure I'm on the latest `master` (d16d5c903772765ff3c7e457ba54e94924d80ede), deleted my `.config`, and went through `menuconfig` changing only: * The target to x86_64, * The task to "create just a toolchain", * Told it to build the toolchain statically in the advanced toolchain options, and * Disabled parallel building (for more predictable errors). I get: ``` Making all in src /usr/bin/gmake all-am /bin/sh ../libtool --tag=CXX --mode=link g++ -Wall -pthread -Wno-switch -static -Wl,-static -o gp-archive gp-archive.o ArchiveExp.o libgprofng.la -L../../zlib -lz libtool: link: g++ -Wall -pthread -Wno-switch -Wl,-static -o gp-archive gp-archive.o ArchiveExp.o ./.libs/libgprofng.a -L/home/john/tmp/openadk/toolchain_build_generic-x86_64_uclibc-ng/w-binutils-2.43.1-1/binutils-2.43.1/zlib -L/home/john/tmp/openadk/toolchain_build_generic-x86_64_uclibc-ng/w-binutils-2.43.1-1/binutils-2.43.1/libiberty /home/john/tmp/openadk/toolchain_build_generic-x86_64_uclibc-ng/w-binutils-2.43.1-1/binutils-2.43.1/opcodes/.libs/libopcodes.a /home/john/tmp/openadk/toolchain_build_generic-x86_64_uclibc-ng/w-binutils-2.43.1-1/binutils-2.43.1/bfd/.libs/libbfd.a -liberty -lpthread -ldl -lz -pthread /usr/bin/ld: cannot find -lgcc_s: No such file or directory /usr/bin/ld: cannot find -lgcc_s: No such file or directory collect2: error: ld returned 1 exit status ``` Any help would be appreciated! -- John Graham (he/him) Software Engineer Codethink Ltd 3rd Floor Dale House 35 Dale Street Manchester M1 2HF United Kingdom Codethink delivers cutting edge open source design, development and integration services. http://codethink.co.uk Office: 0161 236 5575

1 month, 1 week

[PATCH 0/5] Gcc-14 compile fixes

by Phil Sutter

These changes make my DS414 fileserver build pass. Of course, there may be more breaking packages though. The last patch merely fixes a warning, BTW. Phil Sutter (5): package: linux-atm: Revert "fix musl compile" package: apcupsd: Fix for compiling with gcc-13 package: ndisc6: Fix for compiling with gcc-14 package: cfgfs: Fix for compiling with gcc-14 package: cfgfs: Fix for ignored attribute warnings package/apcupsd/Makefile | 2 +- package/cfgfs/src/c_lzo1x1.c | 6 +++--- package/cfgfs/src/c_null.c | 6 +++--- package/cfgfs/src/c_zlib.c | 6 +++--- package/cfgfs/src/compress.h | 6 +++--- package/cfgfs/src/ft_pack.c | 1 + package/linux-atm/patches/patch-src_ilmid_io_c | 15 --------------- package/linux-atm/patches/patch-src_mpoad_io_c | 18 ------------------ .../linux-atm/patches/patch-src_sigd_atmsigd_c | 11 ----------- package/ndisc6/patches/patch-src_traceroute_h | 6 +++--- 10 files changed, 17 insertions(+), 60 deletions(-) delete mode 100644 package/linux-atm/patches/patch-src_ilmid_io_c delete mode 100644 package/linux-atm/patches/patch-src_mpoad_io_c delete mode 100644 package/linux-atm/patches/patch-src_sigd_atmsigd_c -- 2.43.0

2 months

[PATCH] target: linux: config: Set COMPAT_32BIT_TIME on 32bit architectures

by Phil Sutter

Without it, on these architectures 'lvm pvscan' will busy-loop printing: | io_getevents failed: No such file or directory The symbol is defined in kernel's arch/Kconfig with 'default !64BIT || COMPAT'. Introduce Config.in.compat which has the symbol default to y unless a known 64bit ADK_TARGET_ARCH is enabled. Drop the symbol from all target/*/kernel/* for which the default applies. On 64bit systems, enabling this symbol is probably useful to provide comaptibility towards 32bit user space. Not sure if this is a possible choice in OpenADK, but just in case the symbol was not removed from: - target/aarch64/kernel/raspberry-pi4-64 - target/mips64/kernel/qemu-mips64 - target/riscv64/kernel/qemu-riscv64 Another case is targets explicitly having the symbol disabled, namely kvx. Given that the two kernel configs in question are full copies of the kernel-generated one, they are likely not a deliberate choice and thus removed as well. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- target/arc/kernel/qemu-arc | 1 - target/arc/kernel/synopsys-hsdk | 1 - target/arm/kernel/banana-p2-zero | 1 - target/arm/kernel/qemu-arm-realview-eb-mpcore | 1 - target/arm/kernel/qemu-arm-spitz | 1 - target/arm/kernel/qemu-arm-terrier | 1 - target/arm/kernel/qemu-arm-versatilepb | 1 - target/arm/kernel/qemu-arm-vexpress-a9 | 1 - target/arm/kernel/raspberry-pi4 | 1 - target/arm/kernel/solidrun-imx6 | 1 - target/arm/kernel/st-stm32f746g | 1 - target/csky/kernel/qemu-csky | 1 - target/hppa/kernel/qemu-hppa | 1 - target/kvx/kernel/generic-kvx | 1 - target/kvx/kernel/qemu-kvx | 1 - target/linux/Config.in | 1 + target/linux/config/Config.in.compat | 13 +++++++++++++ target/m68k/kernel/aranym-m68k | 1 - target/m68k/kernel/qemu-m68k-mcf5208 | 1 - target/m68k/kernel/qemu-m68k-q800 | 1 - target/m68k/kernel/qemu-m68k-virt | 1 - target/microblaze/kernel/qemu-microblaze-ml605 | 1 - target/microblaze/kernel/qemu-microblaze-s3adsp1800 | 1 - target/mips/kernel/qemu-mips | 1 - target/nios2/kernel/qemu-nios2 | 1 - target/or1k/kernel/qemu-or1k | 1 - target/ppc/kernel/qemu-ppc-bamboo | 1 - target/ppc/kernel/qemu-ppc-macppc | 1 - target/ppc/kernel/qemu-ppc-mpc8544ds | 1 - target/riscv32/kernel/qemu-riscv32 | 1 - target/sh/kernel/numato-mimasv2 | 1 - target/sparc/kernel/qemu-sparc | 1 - target/x86/kernel/qemu-x86 | 1 - 33 files changed, 14 insertions(+), 31 deletions(-) create mode 100644 target/linux/config/Config.in.compat diff --git a/target/arc/kernel/qemu-arc b/target/arc/kernel/qemu-arc index d537406d43081..813c00d2ea6f3 100644 --- a/target/arc/kernel/qemu-arc +++ b/target/arc/kernel/qemu-arc @@ -1,3 +1,2 @@ CONFIG_ARC=y CONFIG_ARC_HAS_ACCL_REGS=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk index 8deed79efb396..55ae3ccb6d7af 100644 --- a/target/arc/kernel/synopsys-hsdk +++ b/target/arc/kernel/synopsys-hsdk @@ -9,4 +9,3 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y CONFIG_ARC_HAS_LL64=y CONFIG_ARC_HAS_DIV_REM=y CONFIG_ARC_HAS_ACCL_REGS=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/banana-p2-zero b/target/arm/kernel/banana-p2-zero index 586bc605a4afc..acd35737e7520 100644 --- a/target/arm/kernel/banana-p2-zero +++ b/target/arm/kernel/banana-p2-zero @@ -37,7 +37,6 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y diff --git a/target/arm/kernel/qemu-arm-realview-eb-mpcore b/target/arm/kernel/qemu-arm-realview-eb-mpcore index acd059cc810cd..9f967f4f2a813 100644 --- a/target/arm/kernel/qemu-arm-realview-eb-mpcore +++ b/target/arm/kernel/qemu-arm-realview-eb-mpcore @@ -16,4 +16,3 @@ CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y CONFIG_CMDLINE="console=ttyAMA0 mem=128M" CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz index 259028d952673..09a1d76ff6e7d 100644 --- a/target/arm/kernel/qemu-arm-spitz +++ b/target/arm/kernel/qemu-arm-spitz @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier index 4a947ea14da84..e8a01e232be8b 100644 --- a/target/arm/kernel/qemu-arm-terrier +++ b/target/arm/kernel/qemu-arm-terrier @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 148fda569cc4c..8c08abdc7e3ed 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -15,4 +15,3 @@ CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_VECTORS_BASE=0x00000000 CONFIG_PHYS_OFFSET=0x00000000 -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b3953ad10836c..170965e9b0675 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,7 +13,6 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_VIRT_EXT=y CONFIG_SWP_EMULATE=y CONFIG_KUSER_HELPERS=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARM_AMBA=y CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y diff --git a/target/arm/kernel/raspberry-pi4 b/target/arm/kernel/raspberry-pi4 index 77c23a9971898..04b7aadffae61 100644 --- a/target/arm/kernel/raspberry-pi4 +++ b/target/arm/kernel/raspberry-pi4 @@ -25,7 +25,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_CLK_BCM2711_DVP=y CONFIG_CLK_BCM2835=y CONFIG_CLK_RASPBERRYPI=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_SERIAL_DEV_BUS=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV_V1=y diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index 801f1d1b7581c..3289ef4e7899f 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/target/arm/kernel/solidrun-imx6 @@ -21,7 +21,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_MXC_TZIC=y CONFIG_MXC_AVIC=y diff --git a/target/arm/kernel/st-stm32f746g b/target/arm/kernel/st-stm32f746g index 7c8375059b1cf..a156d2bff5419 100644 --- a/target/arm/kernel/st-stm32f746g +++ b/target/arm/kernel/st-stm32f746g @@ -25,4 +25,3 @@ CONFIG_DMADEVICES=y CONFIG_STM32_DMA=y CONFIG_STM32_DMAMUX=y CONFIG_STM32_MDMA=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/csky/kernel/qemu-csky b/target/csky/kernel/qemu-csky index 876d5a87f25f8..1d06909b6702f 100644 --- a/target/csky/kernel/qemu-csky +++ b/target/csky/kernel/qemu-csky @@ -5,4 +5,3 @@ CONFIG_NATIONALCHIP_IRQ=y CONFIG_NATIONALCHIP_TIMER=y CONFIG_CSKYMAC=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/hppa/kernel/qemu-hppa b/target/hppa/kernel/qemu-hppa index e0d0e95a3281a..e16c3f4665455 100644 --- a/target/hppa/kernel/qemu-hppa +++ b/target/hppa/kernel/qemu-hppa @@ -6,4 +6,3 @@ CONFIG_GSC_WAX=y CONFIG_GSC_DINO=y CONFIG_SERIAL_MUX=y CONFIG_SERIAL_MUX_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/kvx/kernel/generic-kvx b/target/kvx/kernel/generic-kvx index 1d953b12ebdda..484a43d3aa798 100644 --- a/target/kvx/kernel/generic-kvx +++ b/target/kvx/kernel/generic-kvx @@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y -# CONFIG_COMPAT_32BIT_TIME is not set CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y diff --git a/target/kvx/kernel/qemu-kvx b/target/kvx/kernel/qemu-kvx index 1d953b12ebdda..484a43d3aa798 100644 --- a/target/kvx/kernel/qemu-kvx +++ b/target/kvx/kernel/qemu-kvx @@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y -# CONFIG_COMPAT_32BIT_TIME is not set CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y diff --git a/target/linux/Config.in b/target/linux/Config.in index 42e4efcbbe165..fb9d1810eea11 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -28,3 +28,4 @@ source target/linux/config/Config.in.pm source target/linux/config/Config.in.kvm source target/linux/config/Config.in.virtio source target/linux/config/Config.in.debug +source target/linux/config/Config.in.compat diff --git a/target/linux/config/Config.in.compat b/target/linux/config/Config.in.compat new file mode 100644 index 0000000000000..f255088ab043e --- /dev/null +++ b/target/linux/config/Config.in.compat @@ -0,0 +1,13 @@ +config ADK_LINUX_KERNEL_COMPAT_32BIT_TIME + bool + default n if ADK_TARGET_ARCH_AARCH64 + default n if ADK_TARGET_ARCH_ALPHA + default n if ADK_TARGET_ARCH_IA64 + default n if ADK_TARGET_ARCH_LOONGARCH + default n if ADK_TARGET_ARCH_MIPS64 + default n if ADK_TARGET_ARCH_PPC64 + default n if ADK_TARGET_ARCH_RISCV64 + default n if ADK_TARGET_ARCH_S390 + default n if ADK_TARGET_ARCH_SPARC64 + default n if ADK_TARGET_ARCH_X86_64 + default y diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k index 9a4db207af2ca..fb084e4b98941 100644 --- a/target/m68k/kernel/aranym-m68k +++ b/target/m68k/kernel/aranym-m68k @@ -6,4 +6,3 @@ CONFIG_FPU=y CONFIG_ATARI=y CONFIG_NATFEAT=y CONFIG_NFETH=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/qemu-m68k-mcf5208 b/target/m68k/kernel/qemu-m68k-mcf5208 index 9cfa4b601eac6..42497f9faa3bb 100644 --- a/target/m68k/kernel/qemu-m68k-mcf5208 +++ b/target/m68k/kernel/qemu-m68k-mcf5208 @@ -16,4 +16,3 @@ CONFIG_RAMKERNEL=y CONFIG_BOOTPARAM=y CONFIG_BOOTPARAM_STRING="console=ttyS0,115200" CONFIG_CRC32=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/qemu-m68k-q800 b/target/m68k/kernel/qemu-m68k-q800 index 69cac7e515e58..05324c42bdb64 100644 --- a/target/m68k/kernel/qemu-m68k-q800 +++ b/target/m68k/kernel/qemu-m68k-q800 @@ -7,4 +7,3 @@ CONFIG_ADB=y CONFIG_ADB_MACII=y CONFIG_BOOTPARAM=y CONFIG_BOOTPARAM_STRING="" -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/qemu-m68k-virt b/target/m68k/kernel/qemu-m68k-virt index 47e9200d467a2..db5f51c8e0598 100644 --- a/target/m68k/kernel/qemu-m68k-virt +++ b/target/m68k/kernel/qemu-m68k-virt @@ -1,3 +1,2 @@ CONFIG_M68K=y CONFIG_VIRT=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 9749c22fa570a..932843c131018 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" CONFIG_PCI_XILINX=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE_FORCE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index 91a7dc577c0c0..cf8c3a91c8665 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" CONFIG_PCI_XILINX=y CONFIG_CMDLINE_FORCE=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 85ad371b61dae..94a0a01754ee3 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,4 +3,3 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/nios2/kernel/qemu-nios2 b/target/nios2/kernel/qemu-nios2 index 19e0ac7534a4d..8b354e8a8372b 100644 --- a/target/nios2/kernel/qemu-nios2 +++ b/target/nios2/kernel/qemu-nios2 @@ -10,5 +10,4 @@ CONFIG_NIOS2_DTB_SOURCE_BOOL=y CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" CONFIG_CMDLINE_BOOL=y CONFIG_NIOS2_PASS_CMDLINE=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_NIOS2_ALIGNMENT_TRAP=y diff --git a/target/or1k/kernel/qemu-or1k b/target/or1k/kernel/qemu-or1k index e96067748453c..ee4d9d55cdedd 100644 --- a/target/or1k/kernel/qemu-or1k +++ b/target/or1k/kernel/qemu-or1k @@ -6,4 +6,3 @@ CONFIG_OPENRISC_HAVE_INST_FL1=y CONFIG_OPENRISC_HAVE_INST_MUL=y CONFIG_OPENRISC_HAVE_INST_DIV=y CONFIG_OPENRISC_NO_SPR_SR_DSX=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-bamboo b/target/ppc/kernel/qemu-ppc-bamboo index 424addb14de15..b12292b7bfd5f 100644 --- a/target/ppc/kernel/qemu-ppc-bamboo +++ b/target/ppc/kernel/qemu-ppc-bamboo @@ -3,4 +3,3 @@ CONFIG_PPC32=y CONFIG_44x=y CONFIG_BAMBOO=y CONFIG_PRINTK=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-macppc b/target/ppc/kernel/qemu-ppc-macppc index b873a30968b5c..b68a484c03886 100644 --- a/target/ppc/kernel/qemu-ppc-macppc +++ b/target/ppc/kernel/qemu-ppc-macppc @@ -23,4 +23,3 @@ CONFIG_ADB_CUDA=y CONFIG_INPUT_ADBHID=y CONFIG_CMDLINE_BOOL=y CONFIG_PRINTK=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-mpc8544ds b/target/ppc/kernel/qemu-ppc-mpc8544ds index 515cf400ce9ba..1e51d4b07f286 100644 --- a/target/ppc/kernel/qemu-ppc-mpc8544ds +++ b/target/ppc/kernel/qemu-ppc-mpc8544ds @@ -9,4 +9,3 @@ CONFIG_PHYS_64BIT=y CONFIG_SPE=y CONFIG_PPC_UDBG_16550=y CONFIG_DEFAULT_UIMAGE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32 index 0aab147656c63..e49c3ab0d8459 100644 --- a/target/riscv32/kernel/qemu-riscv32 +++ b/target/riscv32/kernel/qemu-riscv32 @@ -1,7 +1,6 @@ CONFIG_RISCV=y CONFIG_32BIT=y CONFIG_FPU=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_RV32I=y CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=y diff --git a/target/sh/kernel/numato-mimasv2 b/target/sh/kernel/numato-mimasv2 index faa0ff5588239..ca290f15dc124 100644 --- a/target/sh/kernel/numato-mimasv2 +++ b/target/sh/kernel/numato-mimasv2 @@ -15,4 +15,3 @@ CONFIG_MMC_SPI=y CONFIG_CLKSRC_JCORE_PIT=y CONFIG_JCORE_AIC=y CONFIG_SERIAL_EARLYCON=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index 1ee79ef31befa..ffa9bb9f8668e 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -7,4 +7,3 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 index 41a00164c6b95..1049b23d83495 100644 --- a/target/x86/kernel/qemu-x86 +++ b/target/x86/kernel/qemu-x86 @@ -1,4 +1,3 @@ CONFIG_X86=y CONFIG_X86_32=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y -- 2.43.0

2 months

[PATCH 00/19] A bunch of fixes, features and new ports

by Phil Sutter

Hi Waldemar, Here's the result of me trying to update my DS414. Well, actually I also collected some pending fixes and new ports as well so it's not as bad as it seems. :) The first eight patches are clear fixes. The next three as well, but not as critical as the first ones. Patch 12 merely fixes the existing workaround, I sadly haven't managed to implement a proper fix. Patches 13 and 14 are workarounds to build failures for me, yet are valid by themselves. The remaining ones add new functionality. Happy new year! Cheers, Phil Phil Sutter (19): package: samba: Fix for large files on 32bit target package: ffmpeg: Do not mandatory depend on libressl package: ffmpeg: Fix for build failure with newer binutils package: ffmpeg: Drop outdated synth_filter_vfp.S extra source target: config: Newer kernels moved DTB files package: zlib: Fix for wrong zlib.pc content in host build package: libffi: Fix for wrong libffi.pc content in host build package: libxml2: Also fix for wrong libxml2.pc content in host build package: glib: glib-host to explicitly depend on zlib-host package: mdadm: Update to version 4.4 package: python3-jinja2: Fix for including non-existent file package: ca-certificates: Fix python3 path package: util-linux: Do not build lsfd if not needed package: openssl: Disable docs build package: base-files: Add bonding support to network scripts package: Port libexif package: Port minidlna package: Port apcupsd package: Port zfs package package/apcupsd/Makefile | 44 ++++ package/apcupsd/files/apccontrol | 74 +++++++ package/apcupsd/files/apcupsd.conffiles | 1 + package/apcupsd/files/apcupsd.init | 38 ++++ package/apcupsd/files/apcupsd.postinst | 3 + package/base-files/files/interfaces-dhcp | 11 +- .../src/etc/network/if-post-down.d/04-bonding | 20 ++ .../src/etc/network/if-pre-up.d/05-bonding | 37 ++++ .../patches/patch-mozilla_Makefile | 2 +- package/ffmpeg/Makefile | 8 +- ...lpdsp_armv5te-fix-label-format-to-wo.patch | 59 +++++ .../src/libavcodec/arm/synth_filter_vfp.S | 206 ------------------ package/glib/Makefile | 2 +- package/libexif/Makefile | 27 +++ package/libffi/Makefile | 1 - package/libxml2/Makefile | 1 - package/mdadm/Makefile | 17 +- package/minidlna/Makefile | 29 +++ package/minidlna/files/minidlna.init | 36 +++ package/minidlna/files/minidlna.postinst | 3 + ...-Try-syslog-if-no-log-path-was-given.patch | 104 +++++++++ package/openssl/Makefile | 2 +- package/python3-jinja2/Makefile | 2 +- package/samba/Makefile | 5 +- package/samba/files/cache.txt | 2 - package/util-linux/Makefile | 5 + package/zfs/Makefile | 70 ++++++ ...t-for-cross-compiling-kernel-modules.patch | 53 +++++ package/zlib/Makefile | 3 +- target/config/Config.in.kernelfmt | 21 +- target/linux/config/Config.in.input | 1 + 31 files changed, 661 insertions(+), 226 deletions(-) create mode 100644 package/apcupsd/Makefile create mode 100644 package/apcupsd/files/apccontrol create mode 100644 package/apcupsd/files/apcupsd.conffiles create mode 100644 package/apcupsd/files/apcupsd.init create mode 100644 package/apcupsd/files/apcupsd.postinst create mode 100755 package/base-files/src/etc/network/if-post-down.d/04-bonding create mode 100755 package/base-files/src/etc/network/if-pre-up.d/05-bonding create mode 100644 package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch delete mode 100644 package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S create mode 100644 package/libexif/Makefile create mode 100644 package/minidlna/Makefile create mode 100644 package/minidlna/files/minidlna.init create mode 100644 package/minidlna/files/minidlna.postinst create mode 100644 package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch create mode 100644 package/zfs/Makefile create mode 100644 package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch -- 2.43.0

2 months

[PATCH v2] package: Port minidlna

by Phil Sutter

This is a more capable alternative to gmediaserver. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- Changes since v1: - Add missing dependencies: libsqlite and libiconv --- package/minidlna/Makefile | 29 +++++ package/minidlna/files/minidlna.init | 36 ++++++ package/minidlna/files/minidlna.postinst | 3 + ...-Try-syslog-if-no-log-path-was-given.patch | 104 ++++++++++++++++++ 4 files changed, 172 insertions(+) create mode 100644 package/minidlna/Makefile create mode 100644 package/minidlna/files/minidlna.init create mode 100644 package/minidlna/files/minidlna.postinst create mode 100644 package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch diff --git a/package/minidlna/Makefile b/package/minidlna/Makefile new file mode 100644 index 0000000000000..2a51c978d4289 --- /dev/null +++ b/package/minidlna/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= minidlna +PKG_VERSION:= 1.3.3 +PKG_RELEASE:= 1 +PKG_HASH:= 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 +PKG_DESCR:= DLNA/UPnP-AV compliant media server +PKG_SECTION:= mm/video +PKG_DEPENDS:= libffmpeg libjpeg-turbo libexif libid3tag libogg libflac libvorbis libsqlite libiconv +PKG_BUILDDEP:= ffmpeg libjpeg-turbo libexif libid3tag libogg flac libvorbis sqlite libiconv +PKG_URL:= http://sourceforge.net/projects/minidlna/ +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=minidlna/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIDLNA,minidlna,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +minidlna-install: + $(INSTALL_DIR) $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/minidlnad \ + $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_DIR) $(IDIR_MINIDLNA)/etc/ + $(INSTALL_DATA) $(WRKSRC)/minidlna.conf $(IDIR_MINIDLNA)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minidlna/files/minidlna.init b/package/minidlna/files/minidlna.init new file mode 100644 index 0000000000000..c4a1fe79593a0 --- /dev/null +++ b/package/minidlna/files/minidlna.init @@ -0,0 +1,36 @@ +#!/bin/sh +#PKG minidlna +#INIT 60 +. /etc/rc.conf + +pidfile=$(echo "$minidlna_flags" | sed -n 's/.*-P $[^ ]\+$.*/\1/p') +[ "$pidfile" ] || pidfile="/var/run/minidlna/minidlna.pid" + +case $1 in +autostop) ;; +autostart) + test x"${minidlna:-NO}" = x"NO" && exit 0 + test x"$minidlna" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + /usr/sbin/minidlnad $minidlna_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm $pidfile + else + kill $(pgrep -f /usr/sbin/minidlnad) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/minidlna/files/minidlna.postinst b/package/minidlna/files/minidlna.postinst new file mode 100644 index 0000000000000..6c14ff1e84973 --- /dev/null +++ b/package/minidlna/files/minidlna.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf minidlna NO diff --git a/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch new file mode 100644 index 0000000000000..c42c28097ea81 --- /dev/null +++ b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch @@ -0,0 +1,104 @@ +From 989841a0c4e83b0ac1b9d276be3797bcfa83bcb1 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil(a)nwl.cc> +Date: Sun, 27 Nov 2022 23:45:41 +0100 +Subject: [PATCH] log: Try syslog if no log path was given + +Signed-off-by: Phil Sutter <phil(a)nwl.cc> +--- + log.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- + minidlna.c | 2 -- + 2 files changed, 42 insertions(+), 4 deletions(-) + +diff --git a/log.c b/log.c +index a989904a24d93..840a8c02e678b 100644 +--- a/log.c ++++ b/log.c +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <stdarg.h> + #include <string.h> ++#include <syslog.h> + #include <time.h> + + #include "upnpglobalvars.h" +@@ -147,6 +148,40 @@ log_init(const char *debug) + return 0; + } + ++static int ++syslog_err(int level, enum _log_facility facility, ++ char *fname, int lineno, char *fmt, va_list *ap) ++{ ++ char myfmt[1024]; ++ int level_to_syslog[E_MAXDEBUG + 1] = { ++ /* [E_OFF] = 0, */ ++ [E_FATAL] = LOG_CRIT, ++ [E_ERROR] = LOG_ERR, ++ [E_WARN] = LOG_WARNING, ++ [E_INFO] = LOG_NOTICE, ++ [E_DEBUG] = LOG_INFO, ++ [E_MAXDEBUG] = LOG_DEBUG, ++ }; ++ ++ if (level == E_OFF) ++ return 0; ++ ++ if (level > E_MAXDEBUG) ++ return -1; ++ ++ if (level) ++ snprintf(myfmt, 1024, "%s:%d: %s: %s", fname, lineno, level_name[level], fmt); ++ else ++ snprintf(myfmt, 1024, "%s:%d: %s", fname, lineno, fmt); ++ ++ vsyslog(level_to_syslog[level], myfmt, *ap); ++ ++ if (level == E_FATAL) ++ exit(-1); ++ ++ return 0; ++} ++ + void + log_err(int level, enum _log_facility facility, char *fname, int lineno, char *fmt, ...) + { +@@ -155,8 +190,14 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + if (level && level>log_level[facility] && level>E_FATAL) + return; + +- if (!log_fp) ++ va_start(ap, fmt); ++ if (!log_fp) { ++ if (!syslog_err(level, facility, fname, lineno, fmt, &ap)) { ++ va_end(ap); ++ return; ++ } + log_fp = stdout; ++ } + + // timestamp + if (!GETFLAG(SYSTEMD_MASK)) +@@ -176,7 +217,6 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + fprintf(log_fp, "%s:%d: ", fname, lineno); + + // user log +- va_start(ap, fmt); + if (vfprintf(log_fp, fmt, ap) == -1) + { + va_end(ap); +diff --git a/minidlna.c b/minidlna.c +index 999adee977353..db29d603d1e28 100644 +--- a/minidlna.c ++++ b/minidlna.c +@@ -817,8 +817,6 @@ init(int argc, char **argv) + optionsfile); + } + } +- if (!log_path[0]) +- strncpyt(log_path, DEFAULT_LOG_PATH, sizeof(log_path)); + if (!db_path[0]) + strncpyt(db_path, DEFAULT_DB_PATH, sizeof(db_path)); + +-- +2.38.1 + -- 2.43.0

2 months

PkgConf not installing into target root

by Ingwie

Hello! I found an odd behaviour where pkgconf will not install it's shared library into the target root - although it is completely built: root@riscboi /n/o/openadk (master)# tar tvf firmware/generic-riscv64_musl/generic-riscv64-musl-archive+kernel.tar.xz | grep pkgconf -rwxr-xr-x root/root 26840 2024-03-12 01:59 usr/bin/pkgconf lrwxrwxrwx root/root 0 2024-03-12 01:59 usr/bin/pkg-config -> pkgconf drwxr-xr-x root/root 0 2024-03-12 04:09 usr/lib/pkgconfig/ -rw-r--r-- root/root 277 2024-03-12 03:38 usr/lib/pkgconfig/expat.pc -rw-r--r-- root/root 595 2024-03-12 01:26 usr/lib/pkgconfig/form.pc -rw-r--r-- root/root 245 2024-03-12 00:50 usr/lib/pkgconfig/gmp.pc -rw-r--r-- root/root 305 2024-03-12 01:39 usr/lib/pkgconfig/libarchive.pc -rw-r--r-- root/root 275 2024-03-12 01:17 usr/lib/pkgconfig/libcrypto.pc -rw-r--r-- root/root 1613 2024-03-12 01:21 usr/lib/pkgconfig/libcurl.pc -rw-r--r-- root/root 255 2024-03-12 03:33 usr/lib/pkgconfig/libelf.pc -rw-r--r-- root/root 378 2024-03-12 01:35 usr/lib/pkgconfig/liblzma.pc -rw-r--r-- root/root 296 2024-03-12 01:17 usr/lib/pkgconfig/libssl.pc -rw-r--r-- root/root 289 2024-03-12 01:17 usr/lib/pkgconfig/libtls.pc -rw-r--r-- root/root 456 2024-03-12 01:55 usr/lib/pkgconfig/libzstd.pc -rw-r--r-- root/root 595 2024-03-12 01:26 usr/lib/pkgconfig/menu.pc -rw-r--r-- root/root 272 2024-03-12 00:53 usr/lib/pkgconfig/mpfr.pc -rw-r--r-- root/root 595 2024-03-12 01:26 usr/lib/pkgconfig/ncurses.pc -rw-r--r-- root/root 251 2024-03-12 01:17 usr/lib/pkgconfig/openssl.pc -rw-r--r-- root/root 597 2024-03-12 01:26 usr/lib/pkgconfig/panel.pc -rw-r--r-- root/root 602 2024-03-12 01:26 usr/lib/pkgconfig/tinfo.pc -rw-r--r-- root/root 252 2024-03-12 01:06 usr/lib/pkgconfig/zlib.pc root@riscboi /n/o/openadk (master)# find root_generic-riscv64_musl/ -name "libpkgconf*" (no output) root@riscboi /n/o/openadk (master)# find build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/ -name "libpkgconf*" build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/include/pkgconf/libpkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/include/pkgconf/libpkgconf/libpkgconf.h build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/lib/libpkgconf.la build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/lib/libpkgconf.so build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/lib/pkgconfig/libpkgconf.pc build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/lib/libpkgconf.so.2.0.0 build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/lib/libpkgconf.so.2 What is odd though is that the pkgconf binary itself _is_ installed: # find root_generic-riscv64_musl/ build_generic-riscv64_musl/w-pkgconf-1.1.0-1/ -name pkgconf root_generic-riscv64_musl/usr/bin/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/pkgconf-1.1.0/.libs/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/pkgconf-1.1.0/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/bin/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/include/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/root/usr/share/doc/pkgconf build_generic-riscv64_musl/w-pkgconf-1.1.0-1/fake-riscv64/pkg-pkgconf/usr/bin/pkgconf And the package itself doesn't contain it either: # tar tvf firmware/generic-riscv64_musl/packages/pkgconf_1.1.0-1_riscv64.tar.xz drwxr-xr-x root/root 0 2024-03-12 08:42 ./ drwxr-xr-x root/root 0 2024-03-12 08:40 ./usr/ drwxr-xr-x root/root 0 2024-03-12 08:40 ./usr/bin/ lrwxrwxrwx root/root 0 2024-03-12 08:40 ./usr/bin/pkg-config -> pkgconf -rwxr-xr-x root/root 26840 2024-03-12 08:40 ./usr/bin/pkgconf Looking at the pkgconf-install target in package/pkgconf/Makefile shows that that library is never installed, causing the target system to run into numerous errors when trying to execute the tool. This is my current workaround. Not very elegant; but... it gets the job done. diff --git a/package/pkgconf/Makefile b/package/pkgconf/Makefile index cebfeb44d..640bce899 100644 --- a/package/pkgconf/Makefile +++ b/package/pkgconf/Makefile @@ -29,9 +29,13 @@ endif (cd $(STAGING_HOST_DIR)/usr/bin && ln -sf pkg-config $(GNU_TARGET_NAME)-pkg-config) pkgconf-install: - $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/pkgconf \ - $(IDIR_PKGCONF)/usr/bin + for dir in bin lib include; do \ + $(INSTALL_DIR) $(IDIR_PKGCONF)/usr/$$dir; \ + find $(WRKINST)/usr/$$dir -type f \ + -exec ${INSTALL_BIN} "{}" "$(IDIR_PKGCONF)/usr/{}" \; ; \ + done + #$(INSTALL_BIN) $(WRKINST)/usr/bin/pkgconf \ + # $(IDIR_PKGCONF)/usr/bin (cd $(IDIR_PKGCONF)/usr/bin && ln -sf pkgconf pkg-config) include ${ADK_TOPDIR}/mk/host-bottom.mk Hope this'll be useful!

1 year

Skip kernel building? (rootfs only mode)

by Ingwie

Hello there! This is a really simple one but I haven't been able to find it yet. Since there are various configurations in the tasks/ folder, I would like to know if it would be possible to make one, in which a kernel image is not built? Reason being that I am trying to construct a rootfs for a Docker container. So, a kernel is not needed - just the headers. Is that possible? Kind regards, Ingwie

1 year

Re: [uclibc-ng-devel] Target GCC compiled via OpenADK can't find dl_iterate_phdr

by Waldemar Brodkorb

Hi Kevin, this might be better posted to the OpenADK mailinglist. > Hello there! > > Apologies if this is going into the wrong list, but I honestly was n't sure,e specially since this very issue was discussed a long time ago - found an exchange about this in the archive through Google - so I ended up just posting it here. > > I am currently building a toolset for RISC-V to use as a rootfs for a Docker Container that can then be used as a Jenkins agent to eventually build my way through Alpine's abuild/aports, so that I can reconstruct the alpine:3.19 image, but for RISC-V (there are only snapshots and the :edge image, right now). > > Most things built just fine; kernel, toolchain and alike. But when it tries to configure libatomic for the target, this happens: > > configure:14906: riscv64-openadk-linux-uclibc-cc -o conftest -g -O2 -g -Os -fno-sync-libcalls -pthread conftest.c >&5/nvme/opt/openadk/toolchain_generic-riscv64_uclibc-ng/usr/lib/gcc/riscv64-openadk-linux-uclibc/13.2.0/../../../../riscv64-openadk-linux-uclibc/bin/ld: /nvme/opt/openadk/toolchain_generic-riscv64_uclibc-ng/usr/lib/gcc/riscv64-openadk-linux-uclibc/13.2.0/libgcc.a(unwind-dw2-fde-dip.o): in function `_Unwind_Find_FDE': > (.text+0x1adc): undefined reference to `dl_iterate_phdr' > configure:14925: error: Pthreads are required to build libatomic > > I went and looked up what that function is, exactly, and learned quickly that this is caused by me having chosen a static build. That said, this was also already discussed: https://uclibc.uclibc.narkive.com/079V4ltx/dl-iterate-phdr-missing-in-libc > > So, I am at a loss on what to do right now. I changed my setting to also build dynamic objects, then cleaned uClibc-ng and rebuilt and then attempted again to let the normal build run. But, that too, did not help. > > My questions: > > - Is dl_iterate_phdr in libc.a? According to grep, it matches, but that doesn-ät mean much. > - I am using the 1.0.46 version of uClibc as openADK selects that. > - Is there anything I can do to fix this, or do I have to start over and just build with shared libraries? I honestly would not be surprised if GCC just didn#t want to be statically linked; static is the devil, after all. ;) > Do you have a OpenADK .config to check? But I think you might be right that you should build gcc with shared libraries supported. best regards Waldemar

1 year

[PATCH] Move overwrite of BINFMT-related options lower.

by Dmitry Chestnykh

The goal of this change is to fix FDPIC toolchain compilation. Previous implementation had the issue that `make oldconfig` destroyed the effect of `echo` and `sed` executing to write BINFMT-related lines into .config. Note that we have to use `echo UCLIBC_FORMAT_*=y` instead of sed because in the original file `UCLIBC_FORMAT_*` line may not exist. Sed just replaces text in lines, so if the line doesn't exist sed will do nothing. To have the proper `UCLIBC_FORMAT_*=y` in the .config I've changed some `sed`s to `echo`s. Without this change the compilation of FDPIC toolchain fails because UCLIBC_FORMAT_FDPIC_ELF is not defined, it leads to miss of `-mfdpic` compilation flag and to the absense of crtreloc.o object that needs during utilities linking and the linking process fails. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- toolchain/uclibc-ng/Makefile | 71 ++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 6b1fd31ce..cabac310d 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -85,42 +85,6 @@ ifeq ($(ADK_TARGET_HARD_FLOAT_DP),y) $(SED) 's/.*$UCLIBC_HAS_FPU$.*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*$UCLIBC_HAS_SOFT_FLOAT$.*/# \1 is not set/' ${WRKBUILD}/.config endif -ifeq ($(ADK_TARGET_BINFMT_ELF),y) - $(SED) 's/.*$UCLIBC_FORMAT_ELF$.*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config -endif -ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) - $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config -endif -ifeq ($(ADK_TARGET_BINFMT_FLAT),y) - echo '# UCLIBC_FORMAT_FLAT is not set' >> ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT$.*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config -ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) - echo '# UCLIBC_FORMAT_FLAT_SEP_DATA is not set' >> ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT $.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config -endif -ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y) - echo '# UCLIBC_FORMAT_SHARED_FLAT is not set' >> ${WRKBUILD}/.config - echo '# HAVE_NO_SHARED is not set' >> ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/\1=y/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT $.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config - $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config -endif -endif ifeq ($(ADK_TARGET_LIBC_WITH_LIBICONV),y) $(SED) 's/.*$UCLIBC_HAS_LIBICONV$.*/\1=y/' ${WRKBUILD}/.config endif @@ -344,6 +308,41 @@ endif UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ oldconfig + +ifeq ($(ADK_TARGET_BINFMT_ELF),y) + echo 'UCLIBC_FORMAT_ELF=y' >> ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config +endif +ifeq ($(ADK_TARGET_BINFMT_FDPIC),y) + echo 'UCLIBC_FORMAT_FDPIC_ELF=y' >> ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config +endif +ifeq ($(ADK_TARGET_BINFMT_FLAT),y) + echo 'UCLIBC_FORMAT_FLAT=y' >> ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config +ifeq ($(ADK_TARGET_BINFMT_FLAT_SEP_DATA),y) + echo 'UCLIBC_FORMAT_FLAT_SEP_DATA=y' >> ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT $.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_SHARED_FLAT$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config +endif +ifeq ($(ADK_TARGET_BINFMT_FLAT_SHARED),y) + echo '# HAVE_NO_SHARED is not set' >> ${WRKBUILD}/.config + echo 'UCLIBC_FORMAT_SHARED_FLAT=y' >> ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT $.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FLAT_SEP_DATA$.*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*$UCLIBC_FORMAT_FDPIC_ELF$.*/# \1 is not set/' ${WRKBUILD}/.config +endif +endif + ifeq ($(ADK_TARGET_LIBC_WITH_LOCALE),y) $(SED) 's/.*$UCLIBC_BUILD_MINIMAL_LOCALES$.*/\1="$(ADK_RUNTIME_DEFAULT_LOCALE)"/' ${WRKBUILD}/.config endif -- 2.43.0

1 year

[PATCH] Disable GCC older than 10.5.0 for CRIS.

by Dmitry Chestnykh

Older GCC versions stops support of cris-*-linux* and crisv32-*-* targets. Signed-off-by: Dmitry Chestnykh <dm.chestnykh(a)gmail.com> --- target/config/Config.in.compiler | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 170be2ccb..2012acc4f 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -34,12 +34,14 @@ config ADK_TOOLCHAIN_GCC_GIT config ADK_TOOLCHAIN_GCC_13 bool "13.2.0" depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_SPARC config ADK_TOOLCHAIN_GCC_12 bool "12.3.0" depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_LOONGARCH depends on !ADK_TARGET_ARCH_SPARC @@ -47,6 +49,7 @@ config ADK_TOOLCHAIN_GCC_12 config ADK_TOOLCHAIN_GCC_11 bool "11.4.0" depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_C6X depends on !ADK_TARGET_ARCH_METAG depends on !ADK_TARGET_ARCH_LOONGARCH -- 2.43.1

1 year

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev