dev April 2020

dev@openadk.org

2 participants
20 discussions

[PATCH 5/5] shairpoint-sync: proper startup integration

by Joerg Seitter

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

3 years, 12 months

[PATCH 1/4] new package libconfig

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/libconfig/Makefile | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/libconfig/Makefile diff --git a/package/libconfig/Makefile b/package/libconfig/Makefile new file mode 100644 index 000000000..4cb87e79f --- /dev/null +++ b/package/libconfig/Makefile @@ -0,0 +1,27 @@ +# 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:= libconfig +PKG_VERSION:= 1.7.2 +PKG_RELEASE:= 1 +PKG_HASH:= 7c3c7a9c73ff3302084386e96f903eb62ce06953bb1666235fac74363a16fad9 +PKG_DESCR:= configuration library +PKG_SECTION:= libs/misc +PKG_URL:= https://github.com/hyperrealm/libconfig +PKG_SITES:= https://github.com/hyperrealm/libconfig/raw/master/docs/dist/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBCONFIG,libconfig,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libconfig-install: + $(INSTALL_DIR) $(IDIR_LIBCONFIG)/usr/lib + $(CP) $(WRKINST)/usr/lib/libconfig*.so* \ + $(IDIR_LIBCONFIG)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.20.1

3 years, 12 months

[PATCH 1/2] nodejs: updated to 12.16.2 LTS

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/nodejs/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/Makefile b/package/nodejs/Makefile index a3747b04f..db6b8a1d3 100644 --- a/package/nodejs/Makefile +++ b/package/nodejs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nodejs -PKG_VERSION:= 8.2.1 +PKG_VERSION:= 12.16.2 PKG_RELEASE:= 1 -PKG_HASH:= 66fe1379bc7daf9a16c6b5c45ab695bf1cdcfae9738d2989e940104d6b31973f +PKG_HASH:= 48b21340eff95bfc6e7297e4a027f5db74d6d64257c476972a1b2f2fdccc9582 PKG_DESCR:= asynchronous event driven framework PKG_SECTION:= net/http PKG_DEPENDS:= zlib @@ -48,7 +48,7 @@ host-build: nodejs-hostinstall: cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ ${HOST_FAKE_FLAGS} DESTDIR='${STAGING_HOST_DIR}' ${HOST_INSTALL_TARGET} $(MAKE_TRACE) - $(INSTALL_BIN) ${WRKBUILD}/out/Release/mkpeephole ${STAGING_HOST_DIR}/usr/bin +# $(INSTALL_BIN) ${WRKBUILD}/out/Release/mkpeephole ${STAGING_HOST_DIR}/usr/bin do-configure: (cd $(WRKSRC); \ @@ -62,7 +62,7 @@ do-configure: --without-intl \ --shared-zlib \ ) - $(SED) "s#<(mkpeephole_exec)#$(STAGING_HOST_DIR)/usr/bin/mkpeephole#g" $(WRKSRC)/deps/v8/src/v8.gyp +# $(SED) "s#<(mkpeephole_exec)#$(STAGING_HOST_DIR)/usr/bin/mkpeephole#g" $(WRKSRC)/deps/v8/src/v8.gyp nodejs-install: $(INSTALL_DIR) $(IDIR_NODEJS)/usr/lib -- 2.11.0

4 years

[PATCH 1/1] new package mqttmpd

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/mqttmpd/Makefile | 28 ++++++++++++++++++++++++++++ package/mqttmpd/patches/patch-Makefile | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 package/mqttmpd/Makefile create mode 100644 package/mqttmpd/patches/patch-Makefile diff --git a/package/mqttmpd/Makefile b/package/mqttmpd/Makefile new file mode 100644 index 000000000..264e82307 --- /dev/null +++ b/package/mqttmpd/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:= mqttmpd +PKG_VERSION:= r5 +PKG_RELEASE:= 1 +PKG_GIT:= tag +PKG_DESCR:= mqtt mpd bridge +PKG_SECTION:= mm/audio +PKG_DEPENDS:= mosquitto mpd +PKG_BUILDDEP:= mosquitto +PKG_URL:= https://github.com/kurt-vd/mqttmpd +PKG_SITES:= https://github.com/kurt-vd/mqttmpd.git + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MQTTMPD,mqttmpd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual + +mqttmpd-install: + $(INSTALL_DIR) $(IDIR_MQTTMPD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/mqttmpd \ + $(IDIR_MQTTMPD)/usr/bin + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/mqttmpd/patches/patch-Makefile b/package/mqttmpd/patches/patch-Makefile new file mode 100644 index 000000000..81036fe66 --- /dev/null +++ b/package/mqttmpd/patches/patch-Makefile @@ -0,0 +1,32 @@ +--- mqttmpd-r5.orig/Makefile 2020-04-22 16:34:15.000000000 +0200 ++++ mqttmpd-r5/Makefile 2020-04-23 23:12:16.506689542 +0200 +@@ -1,12 +1,12 @@ + PROGS = mqttmpd + default : $(PROGS) + +-PREFIX = /usr/local ++PREFIX = /usr + +-CC = gcc +-CFLAGS = -Wall +-CPPFLAGS= -D_GNU_SOURCE +-LDLIBS = -lmosquitto ++#CC = gcc ++CFLAGS+= -Wall ++CPPFLAGS+= -D_GNU_SOURCE ++LDLIBS+= -lmosquitto + INSTOPTS= -s + + VERSION := $(shell git describe --tags --always) +@@ -15,8 +15,10 @@ VERSION := $(shell git describe --tags - + + CPPFLAGS += -DVERSION=\"$(VERSION)\" + ++all: $(PROGS) ++ + install: $(PROGS) +- $(foreach PROG, $(PROGS), install -vp -m 0777 $(INSTOPTS) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG);) ++ $(foreach PROG, $(PROGS), install -vp -D -m 0777 $(INSTOPTS) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG);) + + clean: + rm -rf $(wildcard *.o) $(PROGS) -- 2.11.0

4 years

[PATCH 1/1] mpd: fixed version number

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/mpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 90966321c..82e02ab0a 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -4,7 +4,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= mpd -PKG_VERSION:= 0.21.16 +PKG_VERSION:= 0.20.13 PKG_RELEASE:= 1 PKG_HASH:= 46c1c534d80a52de00263e8ef43a6011ff9d765232443749539ef26b1b48ff40 PKG_DESCR:= music player daemon -- 2.11.0

4 years

[PATCH 5/7] new package knxd

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/knxd/Makefile | 42 +++++++++++++++++++++++++++++ package/knxd/patches/patch-tools_version_sh | 10 +++++++ 2 files changed, 52 insertions(+) create mode 100644 package/knxd/Makefile create mode 100644 package/knxd/patches/patch-tools_version_sh diff --git a/package/knxd/Makefile b/package/knxd/Makefile new file mode 100644 index 000000000..67a718b86 --- /dev/null +++ b/package/knxd/Makefile @@ -0,0 +1,42 @@ +# 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 + +# always use tab spaces as separator, no spaces +PKG_NAME:= knxd +PKG_VERSION:= v0.14 +PKG_RELEASE:= 1 +PKG_GIT:= branch +PKG_DESCR:= KNX daemon +PKG_SECTION:= sys/hw +PKG_DEPENDS:= libev +PKG_BUILDDEP:= libev cmake-host +PKG_URL:= https://github.com/knxd/knxd +PKG_SITES:= https://github.com/knxd/knxd.git + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,KNXD,knxd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +AUTOTOOL_STYLE:= bootstrap + +CONFIGURE_ARGS+= --disable-systemd --disable-usb + +knxd-install: + $(INSTALL_DIR) $(IDIR_KNXD)/usr/bin + $(INSTALL_DIR) $(IDIR_KNXD)/usr/lib + $(INSTALL_DIR) $(IDIR_KNXD)/usr/share + $(INSTALL_BIN) $(WRKINST)/usr/bin/knxd \ + $(IDIR_KNXD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/knxtool \ + $(IDIR_KNXD)/usr/bin + $(CP) $(WRKINST)/usr/lib/libeib*.so* \ + $(IDIR_KNXD)/usr/lib + $(CP) $(WRKINST)/usr/libexec/knxd/* \ + $(IDIR_KNXD)/usr/bin + $(CP) $(WRKINST)/usr/share/* \ + $(IDIR_KNXD)/usr/share + + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/knxd/patches/patch-tools_version_sh b/package/knxd/patches/patch-tools_version_sh new file mode 100644 index 000000000..ff6a2f836 --- /dev/null +++ b/package/knxd/patches/patch-tools_version_sh @@ -0,0 +1,10 @@ +--- knxd-v0.14.orig/tools/version.sh 2020-04-18 16:44:30.000000000 +0200 ++++ knxd-v0.14/tools/version.sh 2020-04-18 19:38:03.451807369 +0200 +@@ -1,5 +1,6 @@ + #!/bin/sh +-sed -ne '1s/.*($.*$).*/\1/' -e '1s/-1$//' -e '1p' debian/changelog | tr -d "\n" ++#sed -ne '1s/.*($.*$).*/\1/' -e '1s/-1$//' -e '1p' debian/changelog | tr -d "\n" ++echo "0.14" + test -d .git || exit + git=$(git rev-parse --short HEAD) + lgit=$(git rev-parse --short $(git rev-list -1 HEAD debian/changelog) ) -- 2.11.0

4 years

[PATCH 4/4] neccesary python3 build file

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- mk/python3.mk | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 mk/python3.mk diff --git a/mk/python3.mk b/mk/python3.mk new file mode 100644 index 000000000..d1e18d904 --- /dev/null +++ b/mk/python3.mk @@ -0,0 +1,3 @@ +PYTHON_VERSION=3.8 +PYTHON_LIBDIR:=$(STAGING_HOST_DIR)/usr/lib +PYTHON:=${STAGING_HOST_DIR}/usr/bin/python3 -- 2.11.0

4 years

[PATCH 1/3] fixed typo

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/section.lst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/section.lst b/package/section.lst index cbb722b16..724fbdf32 100644 --- a/package/section.lst +++ b/package/section.lst @@ -61,6 +61,6 @@ libs/video Video Libraries dev/lang Programming Languages dev/perl Perl modules dev/python Python modules -dev/scm Souce Code Management +dev/scm Source Code Management dev/tools Programming Tools dev/header Header files -- 2.11.0

4 years

[PATCH 5/5] new package flask-login

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/flask-login/Makefile | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/flask-login/Makefile diff --git a/package/flask-login/Makefile b/package/flask-login/Makefile new file mode 100644 index 000000000..0bc3d32ba --- /dev/null +++ b/package/flask-login/Makefile @@ -0,0 +1,39 @@ +# 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 + +# always use tab spaces as separator, no spaces +PKG_NAME:= Flask-Login +PKG_VERSION:= 0.5.0 +PKG_RELEASE:= 1 +PKG_HASH:= 6d33aef15b5bcead780acc339464aae8a6e28f13c90d8b1cf9de8b549d1c0b4b +PKG_DESCR:= login management for flask +PKG_SECTION:= dev/python +PKG_DEPENDS:= flask +PKG_URL:= https://pypi.org/project/Flask-Login +PKG_SITES:= https://files.pythonhosted.org/packages/f9/01/f6c0a3a654ca125cf9cd273314c03… +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,FLASK_LOGIN,flask-login,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + +include $(ADK_TOPDIR)/mk/python3.mk + +do-build: + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR) $(PYTHON) ./setup.py build + $(INSTALL_DIR) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages + cd $(WRKBUILD); env PYTHONPATH=$(PYTHON_LIBDIR):$(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages $(PYTHON) ./setup.py install --prefix="$(WRKINST)/usr" + +do-install: + $(INSTALL_DIR) $(IDIR_FLASK_LOGIN)/usr/lib/python$(PYTHON_VERSION)/site-packages + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/Flask_Login* $(IDIR_FLASK_LOGIN)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/easy-install.pth $(IDIR_FLASK_LOGIN)/usr/lib/python$(PYTHON_VERSION)/site-packages/$(PKG_NAME).pth + +# please remove ALL above comments, before commiting +include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.11.0

4 years

[PATCH 4/5] flask: fix site-package path evaluation

by Joerg Seitter

Signed-off-by: Joerg Seitter <adk(a)seitter.net> --- package/flask/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/flask/Makefile b/package/flask/Makefile index 2042ac4df..d05b42e65 100644 --- a/package/flask/Makefile +++ b/package/flask/Makefile @@ -33,6 +33,7 @@ do-build: do-install: $(INSTALL_DIR) $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages - $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/* $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/*egg $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages/ + $(CP) $(WRKINST)/usr/lib/python$(PYTHON_VERSION)/site-packages/easy-install.pth $(IDIR_FLASK)/usr/lib/python$(PYTHON_VERSION)/site-packages/$(PKG_NAME).pth include $(ADK_TOPDIR)/mk/pkg-bottom.mk -- 2.11.0

4 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

dev April 2020