dev February 2021

dev@openadk.org

2 participants
6 discussions

[PATCH v2 1/2] package/busybox: Implement config extractor
by Phil Sutter 25 Feb '21

25 Feb '21

This is a small script updating the stored busybox config files from an extracted source tree. Basically it copies the the files keeping directory hierarchy intact, adjusts contained 'source' calls for the new path (relative to $TOPDIR) and prefixes all defined (and referenced) symbols with 'BUSYBOX_'. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- Changes since v1: - Fix last-minute change in sed argument prep breaking functionality - Also replace default install prefix by '@IDIR@' --- package/busybox/extract_config.sh | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 package/busybox/extract_config.sh diff --git a/package/busybox/extract_config.sh b/package/busybox/extract_config.sh new file mode 100755 index 0000000000000..1d2b08f0f7c0c --- /dev/null +++ b/package/busybox/extract_config.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +[[ -d "$1" ]] || { + echo "Usage: $(basename $0) <busybox_sourcedir>" + exit 1 +} + +bbsrc="$(realpath $1)" +cd $(dirname $0) + +[[ -e config.new ]] && { + echo -n "config.new exists already. delete? [y|n] " + read ans + case "$ans" in + y|Y) + rm -rf config.new + ;; + n|N) + ;; + *) + echo "what is '$ans'?" + exit 1 + esac +} +mkdir -p config.new + +# store config paths relative to $bbsrc into an array +readarray -t configs <<< $(cd "$bbsrc"; find . -type f -name Config.in) + +# copy each config into config.new +for config in "${configs[@]}"; do + mkdir -p config.new/$(dirname $config) + cp "$bbsrc/$config" "config.new/$config" +done + +# store defined config symbols into an array +readarray -t symbols <<< $(grep -hr '^config ' config.new | cut -d' ' -f2) + +### customize busybox config system for OpenADK + +cd config.new + +# no extra mainmenu, allow replacing PREFIX +sed -i -e 's/^mainmenu/# mainmenu/' -e 's,./_install,@IDIR@,' Config.in + +# prefix all symbols with BUSYBOX_ to create a namespace +# limit replacement to lines containing given keywords to +# not mess up help texts and prompts too much +keywords='$config\|depends\|range\|select\|default\|^if $' +sympipe=$(IFS='|'; echo "${symbols[*]}" | sed -e 's/|/\\|/g') +sympipe_s='/'$keywords'/s/\b$'$sympipe'$\b/BUSYBOX_\1/g' + +# fix path of all sourced files +source_s='s,^$source *$$[^ ]*$$,\1package/busybox/config/\2,' + +sed -i -e "$sympipe_s" -e "$source_s" "${configs[@]}" -- 2.30.1

2 2

[PATCH] prereq: Use pkg-config to determine curses library
by Phil Sutter 24 Feb '21

24 Feb '21

Curses detection in adk/config/Makefile is a mess - pkg-config was designed to avoid exactly that, so make it a required tool on all host OSs and use it to define the required curses LIBS and CFLAGS from prereq.sh. Since pkg-config output also contains the right arguments for libtinfo (which depends on the chosen curses variant), no mismatches between the two may happen anymore. --- adk/config/Makefile | 51 ++------------------------------------------- scripts/prereq.sh | 35 +++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 60 deletions(-) diff --git a/adk/config/Makefile b/adk/config/Makefile index 480c314474036..a328fbf59a5d9 100644 --- a/adk/config/Makefile +++ b/adk/config/Makefile @@ -8,58 +8,11 @@ include ${ADK_TOPDIR}/rules.mk endif CP=cp -fpR -HOST_CFLAGS+=-DKBUILD_NO_NLS -w +HOST_CFLAGS+= -DKBUILD_NO_NLS -w ${CURSES_CFLAGS} +LIBS= ${CURSES_LIBS} all: ncurses conf mconf -LIBS= -ifeq (/usr/lib/libtinfo.so, $(wildcard /usr/lib/libtinfo.so)) -LIBS= -ltinfo -endif - -ifeq (/usr/include/ncursesw/curses.h, $(wildcard /usr/include/ncursesw/curses.h)) -HOST_CFLAGS+= -I/usr/include/ncursesw -DCURSES_LOC="<curses.h>" -LIBS+= -lncursesw -else -ifeq (/usr/include/ncurses/ncurses.h, $(wildcard /usr/include/ncurses/ncurses.h)) -HOST_CFLAGS+= -I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>" -LIBS+= -lncurses -else -ifeq (/usr/include/ncurses/curses.h, $(wildcard /usr/include/ncurses/curses.h)) -HOST_CFLAGS+= -I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>" -LIBS+= -lncurses -else -ifeq (/usr/include/ncurses.h, $(wildcard /usr/include/ncurses.h)) -HOST_CFLAGS+= -DCURSES_LOC="<ncurses.h>" -LIBS+= -lncurses -else -ifeq (/usr/local/include/ncurses/ncurses.h, $(wildcard /usr/local/include/ncurses/ncurses.h)) -HOST_CFLAGS+= -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses.h>" -LIBS+= -lncurses -else -ifeq (/usr/local/include/ncurses/curses.h, $(wildcard /usr/local/include/ncurses/curses.h)) -HOST_CFLAGS+= -I/usr/local/include/ncurses -DCURSES_LOC="<ncurses/curses.h>" -LIBS+= -lncurses -else -ifeq (/usr/local/opt/ncurses/include/ncursesw/ncurses.h, $(wildcard /usr/local/opt/ncurses/include/ncursesw/ncurses.h)) -HOST_CFLAGS+= -I/usr/local/opt/ncurses/include -DCURSES_LOC="<ncursesw/ncurses.h>" -LIBS+= -L/usr/local/opt/ncurses/lib -Wl,-rpath -Wl,/usr/local/opt/ncurses/lib -lncursesw -else -ifeq (/usr/pkg/include/ncurses.h, $(wildcard /usr/pkg/include/ncurses.h)) -HOST_CFLAGS+= -I/usr/pkg/include -DCURSES_LOC="<ncurses.h>" -LIBS+= -L/usr/pkg/lib -Wl,-rpath -Wl,/usr/pkg/lib -lncurses -else -HOST_CFLAGS+= -DCURSES_LOC="<curses.h>" -LIBS= -lcurses -endif -endif -endif -endif -endif -endif -endif -endif - CONF_SRC =conf.c MCONF_SRC =mconf.c $(wildcard lxdialog/*.c) SHARED_SRC=zconf.tab.c diff --git a/scripts/prereq.sh b/scripts/prereq.sh index b71adaac19e9e..356ad65ecbfa4 100755 --- a/scripts/prereq.sh +++ b/scripts/prereq.sh @@ -304,6 +304,28 @@ if ! which git >/dev/null 2>&1; then fi printf "found\n" +printf " ---> checking if pkg-config is installed.. " +if ! which pkg-config >/dev/null 2>&1; then + printf "not found\n" + out=1 +else + printf "found\n" +fi + +printf " ---> checking if ncurses is installed.. " +curses="" +for curse in ncursesw ncurses curses; do + pkg-config --exists $curse || continue + curses=$curse + printf "found $curse\n" + CURSES_LIBS=$(pkg-config --libs $curse) + CURSES_CFLAGS=$(pkg-config --cflags $curse) + break +done +if [ -z "$curses" ]; then + printf "not found\n" + out=1 +fi # creating prereq.mk echo "ADK_TOPDIR:=$(readlink -nf . 2>/dev/null || pwd -P)" > $topdir/prereq.mk @@ -327,6 +349,8 @@ echo "ARCH_FOR_BUILD:=$(${CC} -dumpmachine | sed \ -e 's/mipsel-.*/mipsel/' \ -e 's/i[3-9]86/x86/' \ )" >>prereq.mk +echo "CURSES_LIBS:=${CURSES_LIBS}" >> $topdir/prereq.mk +echo "CURSES_CFLAGS:=${CURSES_CFLAGS}" >> $topdir/prereq.mk if [ "$CC" = "clang" ]; then echo "HOST_CC:=${CC} -fbracket-depth=1024" >> $topdir/prereq.mk @@ -423,17 +447,6 @@ fi rm test.c test 2>/dev/null rm Makefile.tmp 2>/dev/null -# for make kernelconfig pkg-config is required to find ncurses -if [ $os = "Darwin" ]; then - printf " ---> checking if pkg-config is installed.. " - if ! which pkg-config >/dev/null 2>&1; then - printf "not found\n" - out=1 - else - printf "found\n" - fi -fi - # error out on any required prerequisite if [ $out -ne 0 ]; then exit -- 2.30.0

1 1

[PATCH RFC] package/freeradius-server: Update to version 3.0.21
by Phil Sutter 22 Feb '21

22 Feb '21

The old version 3.0.13 is no longer available for download. Adjust radiusd.conf, some items were moved to 'security' section. Install all dictionaries in /usr/share/freeradius - the base dictionary includes all but very few of them, so no point in explicitly stating which ones to include. Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- This patch introduces package/libatomic to cover for radiusd requiring this gcc library. It is supposed to work similar to package/libgcc, but libatomic is not installed properly and I failed to fix toolchain/gcc/Makefile accordingly. Any pointers/help regarding gcc Makefile changes highly appreciated. --- package/freeradius-server/Makefile | 14 +++----- package/freeradius-server/files/radiusd.conf | 8 ++--- .../patches/patch-src_include_threads_h | 36 +++++++++++++++++++ .../patches/patch-src_main_tls_c | 16 --------- package/libatomic/Makefile | 31 ++++++++++++++++ 5 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 package/freeradius-server/patches/patch-src_include_threads_h delete mode 100644 package/freeradius-server/patches/patch-src_main_tls_c create mode 100644 package/libatomic/Makefile diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index 60647d336e2b3..5644f8afec99a 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,12 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 3.0.13 +PKG_VERSION:= 3.0.21 PKG_RELEASE:= 1 -PKG_HASH:= 34da25c1a0e39dc57821ed6d1af1c1cc8bb7e280169cc8b4003acbfc4184328e +PKG_HASH:= 2bf914d471d4409fd72e708e308fa32ca8d01d698c518497a1d4b867d50132ae PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius -PKG_DEPENDS:= libltdl libpcre libtalloc libressl +PKG_DEPENDS:= libltdl libpcre libtalloc libressl libatomic PKG_BUILDDEP:= libtool pcre talloc libressl PKG_NEEDS:= threads PKG_URL:= http://www.freeradius.org/ @@ -203,14 +203,10 @@ freeradius-server-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} ${IDIR_FREERADIUS_SERVER}/etc/freeradius/ ; \ done ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius - ${CP} ${WRKINST}/usr/share/freeradius/dictionary \ + ${CP} ${WRKINST}/usr/share/freeradius/dictionary* \ ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ - for f in freeradius freeradius.internal rfc2865 rfc2866 rfc2867 rfc2868 rfc2869 rfc3162 rfc3576 rfc3580 rfc4072 rfc4372 rfc4675 rfc4679 rfc5176; do \ - cp ${WRKINST}/usr/share/freeradius/dictionary.$${f} \ - ${IDIR_FREERADIUS_SERVER}/usr/share/freeradius/ ; \ - done ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/lib/freeradius - ${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-radius.so \ + ${CP} ${WRKINST}/usr/lib/freeradius/libfreeradius-{dhcp,eap,server,radius}.so \ ${IDIR_FREERADIUS_SERVER}/usr/lib ${INSTALL_DIR} ${IDIR_FREERADIUS_SERVER}/usr/sbin ${CP} ${WRKINST}/usr/sbin/radiusd \ diff --git a/package/freeradius-server/files/radiusd.conf b/package/freeradius-server/files/radiusd.conf index b9a573f69afb8..c07f65680aa46 100644 --- a/package/freeradius-server/files/radiusd.conf +++ b/package/freeradius-server/files/radiusd.conf @@ -15,9 +15,6 @@ run_dir = ${localstatedir}/run db_dir = ${raddbdir} libdir = /usr/lib/freeradius pidfile = ${run_dir}/${name}.pid -user = radius -group = radius -#chroot = /path/to/chroot/directory max_request_time = 30 cleanup_delay = 5 @@ -36,7 +33,6 @@ listen { } hostname_lookups = no -allow_core_dumps = no regular_expressions = yes extended_expressions = yes @@ -55,6 +51,10 @@ security { max_attributes = 200 reject_delay = 1 status_server = yes + user = radius + group = radius + allow_core_dumps = no +# chroot = /path/to/chroot/directory } $INCLUDE clients.conf diff --git a/package/freeradius-server/patches/patch-src_include_threads_h b/package/freeradius-server/patches/patch-src_include_threads_h new file mode 100644 index 0000000000000..4626536e4bd44 --- /dev/null +++ b/package/freeradius-server/patches/patch-src_include_threads_h @@ -0,0 +1,36 @@ + fix for: + | src/lib/log.c:37:31: error: 'fr_strerror_buffer' undeclared (first use in this function) + found in https://github.com/Optware/Optware-ng/commit/6ece960830b3291bc4ad5780cdb49b… + +--- freeradius-server-3.0.21.orig/src/include/threads.h 2020-03-24 15:55:09.000000000 +0100 ++++ freeradius-server-3.0.21/src/include/threads.h 2021-02-16 03:54:58.449715370 +0100 +@@ -89,7 +89,7 @@ static _t __fr_thread_local_init_##_n(pt + # define fr_thread_local_get(_n) _n + #elif defined(HAVE_PTHREAD_H) + # include <pthread.h> +-# define fr_thread_local_setup(_t, _n) \ ++# define fr_thread_local_setup(_t, _n) static __thread _t _n;\ + static pthread_key_t __fr_thread_local_key_##_n;\ + static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\ + static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\ +@@ -100,17 +100,17 @@ static void __fr_thread_local_destroy_## + static void __fr_thread_local_key_init_##_n(void)\ + {\ + (void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\ +- (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + }\ + static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\ + {\ + __fr_thread_local_destructor_##_n = func;\ + if (_n) return _n; \ + (void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\ ++ (void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\ + return _n;\ + } + # define fr_thread_local_init(_n, _f) __fr_thread_local_init_##_n(_f) +-# define fr_thread_local_set(_n, _v) __fr_thread_local_set_##_n(_v) +-# define fr_thread_local_get(_n) __fr_thread_local_get_##_n() ++# define fr_thread_local_set(_n, _v) ((int)!((_n = _v) || 1)) ++# define fr_thread_local_get(_n) _n + #endif + #endif diff --git a/package/freeradius-server/patches/patch-src_main_tls_c b/package/freeradius-server/patches/patch-src_main_tls_c deleted file mode 100644 index 3eb635e97a2d3..0000000000000 --- a/package/freeradius-server/patches/patch-src_main_tls_c +++ /dev/null @@ -1,16 +0,0 @@ ---- freeradius-server-3.0.13.orig/src/main/tls.c 2017-03-06 14:58:04.000000000 +0100 -+++ freeradius-server-3.0.13/src/main/tls.c 2017-03-30 05:52:35.584542618 +0200 -@@ -2131,13 +2131,9 @@ int cbtls_verify(int ok, X509_STORE_CTX - } - - if (lookup == 0) { --#if OPENSSL_VERSION_NUMBER >= 0x10100000L -- ext_list = X509_get0_extensions(client_cert); --#else - X509_CINF *client_inf; - client_inf = client_cert->cert_info; - ext_list = client_inf->extensions; --#endif - } else { - ext_list = NULL; - } diff --git a/package/libatomic/Makefile b/package/libatomic/Makefile new file mode 100644 index 0000000000000..9f050b9376a22 --- /dev/null +++ b/package/libatomic/Makefile @@ -0,0 +1,31 @@ +# 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 +include ${ADK_TOPDIR}/toolchain/gcc/Makefile.inc + +PKG_NAME:= libatomic +PKG_DESCR:= gcc atomic library +PKG_SECTION:= base/libs +PKG_OPTS:= noremove + +PKG_DFLT_LIBATOMIC:= y if !ADK_APPLIANCE_TOOLCHAIN + +NO_DISTFILES:= 1 + +include ${ADK_TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBATOMIC,libatomic,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +libatomic-install: + $(INSTALL_DIR) ${IDIR_LIBATOMIC}/$(ADK_TARGET_LIBC_PATH) +ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),) + # XXX: properly install libatomic + ${CP} ${TOOLCHAIN_BUILD_DIR}/w-gcc*/gcc-*-final/*/libatomic/.libs/libatomic*.so* ${IDIR_LIBATOMIC}/$(ADK_TARGET_LIBC_PATH) +endif + +include ${ADK_TOPDIR}/mk/pkg-bottom.mk -- 2.30.0

1 0

[PATCH] package/radvd: Update to version 2.18
by Phil Sutter 22 Feb '21

22 Feb '21

The old version didn't get along with newer kernel headers, got error messages like: [...]/linux/if_arp.h:116:8: error: redefinition of 'struct arpreq' Signed-off-by: Phil Sutter <phil(a)nwl.cc> --- package/radvd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/radvd/Makefile b/package/radvd/Makefile index 3b9f6c92d37cf..e134ed1d4ad16 100644 --- a/package/radvd/Makefile +++ b/package/radvd/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= radvd -PKG_VERSION:= 2.12 +PKG_VERSION:= 2.18 PKG_RELEASE:= 1 -PKG_HASH:= b070e77238e789e298a82cba2b1bfb0b0180b4ebc1adfc4e75058adfdbff747b +PKG_HASH:= e1bffefe6537e4b205d33afda35fec6014e5f860cc364850068a6ed9c6a65cdc PKG_DESCR:= routing advertisement daemon for ipv6 PKG_SECTION:= net/ipv6 PKG_DEPENDS:= libdaemon -- 2.30.0

1 0

[PATCH] target/linux/config: Fix MIPS support
by Phil Sutter 22 Feb '21

22 Feb '21

Kernel needs CONFIG_KERNEL_MIPS_FP_SUPPORT, otherwise init segfaults. --- target/linux/config/Config.in.kernel | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel index 7f7f38da19999..32607cc179ecb 100644 --- a/target/linux/config/Config.in.kernel +++ b/target/linux/config/Config.in.kernel @@ -141,6 +141,10 @@ config ADK_LINUX_KERNEL_KERNEL_MODE_NEON bool default y if ADK_TARGET_ARCH_ARM_WITH_NEON +config ADK_LINUX_KERNEL_MIPS_FP_SUPPORT + bool + default y + config ADK_LINUX_KERNEL_PATCH_REALTIME bool -- 2.30.0

1 0

[PATCH 1/2] package/busybox: Implement config extractor
by Phil Sutter 22 Feb '21

22 Feb '21

This is a small script updating the stored busybox config files from an extracted source tree. Basically it copies the the files keeping directory hierarchy intact, adjusts contained 'source' calls for the new path (relative to $TOPDIR) and prefixes all defined (and referenced) symbols with 'BUSYBOX_'. --- package/busybox/extract_config.sh | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100755 package/busybox/extract_config.sh diff --git a/package/busybox/extract_config.sh b/package/busybox/extract_config.sh new file mode 100755 index 0000000000000..638899f7ed4b3 --- /dev/null +++ b/package/busybox/extract_config.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +[[ -d "$1" ]] || { + echo "Usage: $(basename $0) <busybox_sourcedir>" + exit 1 +} + +bbsrc="$(realpath $1)" +cd $(dirname $0) + +[[ -e config.new ]] && { + echo -n "config.new exists already. delete? [y|n] " + read ans + case "$ans" in + y|Y) + rm -rf config.new + ;; + n|N) + ;; + *) + echo "what is '$ans'?" + exit 1 + esac +} +mkdir -p config.new + +# store config paths relative to $bbsrc into an array +readarray -t configs <<< $(cd "$bbsrc"; find . -type f -name Config.in) + +# copy each config into config.new +for config in "${configs[@]}"; do + mkdir -p config.new/$(dirname $config) + cp "$bbsrc/$config" "config.new/$config" +done + +# store defined config symbols into an array +readarray -t symbols <<< $(grep -hr '^config ' config.new | cut -d' ' -f2) + +### customize busybox config system for OpenADK + +cd config.new + +# no extra mainmenu +sed -i -e 's/^mainmenu/# mainmenu/' Config.in + +# prefix all symbols with BUSYBOX_ to create a namespace +# limit replacement to lines containing given keywords to +# not mess up help texts and prompts too much +keywords='\$config\\|depends\\|range\\|select\\|default\\|^if \$' +sympipe=$(IFS='|'; echo "${symbols[*]}" | sed -e 's/|/\\|/g') +sympipe_s='/'$keywords'/s/\b$'$sympipe'$\b/BUSYBOX_\1/g' + +# fix path of all sourced files +source_s='s,^$source *$$[^ ]*$$,\1package/busybox/config/\2,' + +sed -i -e "$sympipe_s" -e "$source_s" "${configs[@]}" -- 2.30.0

1 1

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev February 2021