- dev - example.com

[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

[PATCH 1/1] improved detection of the cfgfs partition by checking for the ID of the partition
by Joerg Seitter 03 Jan '21

03 Jan '21

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/cfgfs/src/fwcf.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/package/cfgfs/src/fwcf.sh b/package/cfgfs/src/fwcf.sh index ea8452850..c6008e93a 100644 --- a/package/cfgfs/src/fwcf.sh +++ b/package/cfgfs/src/fwcf.sh @@ -132,12 +132,13 @@ echo $rootdisk|grep mmcblk >/dev/null 2>&1 if [ $? -ne 0 ]; then rootdisk=${rootdisk%[1-9]} fi -part=$(fdisk -l $rootdisk 2>/dev/null|grep '^/dev'|tail -1|awk '{ print $1 }') +# find last partition with an 88 id +part=$(fdisk -l $rootdisk 2>/dev/null|awk '{if ($2=="*") { print $1" "$9} else {print $1" "$8}}'|grep '^/dev.*88.*'|tail -1|awk '{ print $1 }') if [ -f .cfgfs ]; then . /.cfgfs fi if [ -z $part ]; then - part=$(fdisk -l /dev/sda 2>/dev/null|grep '^/dev'|tail -1|awk '{ print $1 }') + part=$(fdisk -l /dev/sda 2>/dev/null|awk '{if ($2=="*") { print $1" "$9} else {print $1" "$8}}'|grep '^/dev.*88.*'|tail -1|awk '{ print $1 }') if [ -z $part ]; then # otherwise search for MTD device with name cfgfs part=/dev/mtd$(fgrep '"cfgfs"' /proc/mtd 2>/dev/null | sed 's/^mtd$[^:]*$:.*$/\1/')ro -- 2.20.1

1 0

[PATCH 1/1] adjusted python version number to updated python3 package
by Joerg Seitter 19 Dec '20

19 Dec '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- mk/python3.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/python3.mk b/mk/python3.mk index d1e18d904..8c0ca363b 100644 --- a/mk/python3.mk +++ b/mk/python3.mk @@ -1,3 +1,3 @@ -PYTHON_VERSION=3.8 +PYTHON_VERSION=3.9 PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib PYTHON:=${STAGING_HOST_DIR}/usr/bin/python3 -- 2.20.1

1 0

[PATCH 0/8] Spelling fixes in docs and package trees
by unixmania＠gmail.com 06 Jun '20

06 Jun '20

From: Carlos Santos <unixmania(a)gmail.com> Fix several spelling erros found while reading the documentation. Carlos Santos (8): docs: fix spelling in "adding boards" section docs: fix spelling in "daily usage" section docs: fix overwrite vs. override confusions docs: fix spelling in "package reference" section docs: fix mksh documentation URL Fix "program" spelling package template: fix overwrite vs. override confusion docs: fix overwrite vs. override confusion in php-fpm.conf docs/adding-boards.txt | 2 +- docs/adding-packages-auto.txt | 2 +- docs/adding-packages-manual.txt | 2 +- docs/common-usage.txt | 2 +- docs/package-reference.txt | 12 ++++++------ docs/running-openadk.txt | 2 +- package/.template/Makefile | 2 +- package/gdb-arc/Makefile | 2 +- package/gdb-microblaze/Makefile | 2 +- package/gdb/Makefile | 2 +- package/gdbserver/Makefile | 2 +- package/php/files/php-fpm.conf | 4 ++-- scripts/prereq.sh | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) -- 2.18.4

2 9

[PATCH] added package for ralink wireless firmware
by Joerg Seitter 01 Jun '20

01 Jun '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/ralink-firmware/Makefile | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/ralink-firmware/Makefile diff --git a/package/ralink-firmware/Makefile b/package/ralink-firmware/Makefile new file mode 100644 index 000000000..0c8d96656 --- /dev/null +++ b/package/ralink-firmware/Makefile @@ -0,0 +1,28 @@ +# 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:= ralink-firmware +PKG_VERSION:= 1.0 +PKG_RELEASE:= 1 +PKG_HASH:= afecbffbea1bd734437c12db5f24863b9d93c9583a4c0dbe61f57b120f993b87 +PKG_DESCR:= ralink wireless driver firmware +PKG_SECTION:= sys/firmware +PKG_SITES:= http://distfiles.openadk.org/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tgz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,RALINK_FIRMWARE,ralink-firmware,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +do-install: + $(INSTALL_DIR) $(IDIR_RALINK_FIRMWARE)/lib/firmware + ${CP} ${WRKBUILD}/*.bin ${IDIR_RALINK_FIRMWARE}/lib/firmware + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.20.1

1 0

[PATCH 4/4] shairport-sync: switch to avahi to also enable mqtt support
by Joerg Seitter 15 May '20

15 May '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/shairport-sync/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/shairport-sync/Makefile b/package/shairport-sync/Makefile index 6b3abcec3..c85f46ca1 100644 --- a/package/shairport-sync/Makefile +++ b/package/shairport-sync/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_GIT:= tag PKG_DESCR:= airplay daemon PKG_SECTION:= mm/audio -PKG_DEPENDS:= libressl libpopt libdaemon libconfig jack mosquitto -PKG_BUILDDEP:= libressl popt libdaemon libconfig jack mosquitto +PKG_DEPENDS:= libressl libpopt libdaemon libconfig jack mosquitto libavahi +PKG_BUILDDEP:= libressl popt libdaemon libconfig jack mosquitto avahi PKG_URL:= https://github.com/mikebrady/shairport-sync PKG_SITES:= https://github.com/mikebrady/shairport-sync.git @@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --with-pkg-config \ --without-systemv \ --without-systemd \ --with-libdaemon \ - --disable-avahi \ - --with-tinysvcmdns \ + --with-avahi \ + --disable-tinysvcmdns \ --with-alsa \ --with-jack \ --with-mqtt-client \ -- 2.20.1

1 0

[PATCH 3/3] avahi: fixed startup via init.d
by Joerg Seitter 15 May '20

15 May '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/avahi/files/{avahi-daemon.conffiles => avahi.conffiles} | 0 package/avahi/files/avahi.init | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename package/avahi/files/{avahi-daemon.conffiles => avahi.conffiles} (100%) diff --git a/package/avahi/files/avahi-daemon.conffiles b/package/avahi/files/avahi.conffiles similarity index 100% rename from package/avahi/files/avahi-daemon.conffiles rename to package/avahi/files/avahi.conffiles diff --git a/package/avahi/files/avahi.init b/package/avahi/files/avahi.init index ca78aa486..bf4614ad3 100644 --- a/package/avahi/files/avahi.init +++ b/package/avahi/files/avahi.init @@ -1,5 +1,5 @@ #!/bin/sh -#PKG avahi-daemon +#PKG avahi #INIT 75 . /etc/rc.conf -- 2.20.1

1 0

[PATCH 2/2] avahi: fixed postinst of package and removed unneccesary libintl dependency
by Joerg Seitter 15 May '20

15 May '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/avahi/Makefile | 2 +- package/avahi/files/{avahi-daemon.postinst => avahi.postinst} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename package/avahi/files/{avahi-daemon.postinst => avahi.postinst} (100%) diff --git a/package/avahi/Makefile b/package/avahi/Makefile index c9449baea..a5b7cd081 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -19,7 +19,7 @@ PKG_OPTS:= dev DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= AVAHI LIBAVAHI -PKGSS_AVAHI:= libavahi libdaemon libexpat libintl dbus +PKGSS_AVAHI:= libavahi libdaemon libexpat dbus PKGSB_AVAHI:= dbus PKGSS_LIBAVAHI:= dbus PKGSB_LIBAVAHI:= dbus diff --git a/package/avahi/files/avahi-daemon.postinst b/package/avahi/files/avahi.postinst similarity index 100% rename from package/avahi/files/avahi-daemon.postinst rename to package/avahi/files/avahi.postinst -- 2.20.1

1 0

[PATCH] realtek wifi: fixed selection of firmware package and added 8188 kernel driver
by Joerg Seitter 14 May '20

14 May '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- target/linux/config/Config.in.wireless | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/target/linux/config/Config.in.wireless b/target/linux/config/Config.in.wireless index 4e1a2b104..44d6fa401 100644 --- a/target/linux/config/Config.in.wireless +++ b/target/linux/config/Config.in.wireless @@ -294,12 +294,23 @@ config ADK_LINUX_KERNEL_RTL8192CU select ADK_LINUX_KERNEL_RTL_CARDS select ADK_LINUX_KERNEL_MAC80211 select ADK_LINUX_KERNEL_FW_LOADER - select ADK_PACKAGE_REALTEK_FIRMWARE + select ADK_PACKAGE_REALTEK_FIRMWARE_WIRELESS depends on ADK_TARGET_WITH_USB \ || ADK_TARGET_GENERIC help Driver for Realtek RTL8192CU USB +config ADK_LINUX_KERNEL_R8188EU + tristate "Realtek RTL8188EU USB driver" + select ADK_LINUX_KERNEL_RTL_CARDS + select ADK_LINUX_KERNEL_MAC80211 + select ADK_LINUX_KERNEL_FW_LOADER + select ADK_PACKAGE_REALTEK_FIRMWARE_WIRELESS + depends on ADK_TARGET_WITH_USB \ + || ADK_TARGET_GENERIC + help + Driver for Realtek RTL8188EU USB + config ADK_LINUX_KERNEL_RT2400PCI tristate "Ralink rt2400 PCI driver" select ADK_LINUX_KERNEL_RT2X00 -- 2.20.1

1 0

[PATCH 5/5] shairpoint-sync: proper startup integration
by Joerg Seitter 30 Apr '20

30 Apr '20

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/shairport-sync/Makefile | 7 +++-- .../shairport-sync/files/shairport-sync.init | 28 +++++++++++++++++++ .../files/shairport-sync.postinst | 7 +++++ 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 package/shairport-sync/files/shairport-sync.init create mode 100644 package/shairport-sync/files/shairport-sync.postinst diff --git a/package/shairport-sync/Makefile b/package/shairport-sync/Makefile index d9279f0dc..6b3abcec3 100644 --- a/package/shairport-sync/Makefile +++ b/package/shairport-sync/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_GIT:= tag PKG_DESCR:= airplay daemon PKG_SECTION:= mm/audio -PKG_DEPENDS:= libressl popt libdaemon libconfig jack mosquitto +PKG_DEPENDS:= libressl libpopt libdaemon libconfig jack mosquitto PKG_BUILDDEP:= libressl popt libdaemon libconfig jack mosquitto PKG_URL:= https://github.com/mikebrady/shairport-sync PKG_SITES:= https://github.com/mikebrady/shairport-sync.git @@ -32,9 +32,10 @@ CONFIGURE_ARGS+= --with-pkg-config \ shairport-sync-install: $(INSTALL_DIR) $(IDIR_SHAIRPORT_SYNC)/usr/bin + $(INSTALL_DIR) $(IDIR_SHAIRPORT_SYNC)/etc/shairport-sync $(INSTALL_BIN) $(WRKINST)/usr/bin/shairport-sync \ $(IDIR_SHAIRPORT_SYNC)/usr/bin - $(INSTALL_DATA) $(WRKINST)/etc/shairport-sync.conf \ - $(IDIR_SHAIRPORT_SYNC)/etc/shairport-sync.conf + $(INSTALL_DATA) $(WRKINST)/etc/* \ + $(IDIR_SHAIRPORT_SYNC)/etc/shairport-sync/ include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/shairport-sync/files/shairport-sync.init b/package/shairport-sync/files/shairport-sync.init new file mode 100644 index 000000000..c9bcb92bf --- /dev/null +++ b/package/shairport-sync/files/shairport-sync.init @@ -0,0 +1,28 @@ +#!/bin/sh +#PKG shairport-sync +#INIT 80 +. /etc/rc.conf + +case $1 in +autostop) ;; +autostart) + test x"${shairport_sync:-NO}" = x"NO" && exit 0 + test x"$shairport_sync" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + /usr/bin/shairport-sync -c /etc/shairport/shairport-sync.conf -d $shairport_sync_flags + ;; +stop) + /usr/bin/shairport-sync -k + ;; +restart) + sh $0 stop + sh $0 start + ;; +*) + echo "Usage: $0 {start | stop | restart}" + exit 1 + ;; +esac +exit $? diff --git a/package/shairport-sync/files/shairport-sync.postinst b/package/shairport-sync/files/shairport-sync.postinst new file mode 100644 index 000000000..9558f175a --- /dev/null +++ b/package/shairport-sync/files/shairport-sync.postinst @@ -0,0 +1,7 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf shairport_sync NO +add_rcconf shairport_sync_flags " " +gid=$(get_next_gid) +add_group shairport-sync $gid +add_user shairport-sync $(get_next_uid) $gid /etc/shairport-sync -- 2.20.1

1 0