Skip to content

Commit

Permalink
Merge pull request #56 from hifiberry/202003
Browse files Browse the repository at this point in the history
March 2020 release
  • Loading branch information
hifiberry authored Mar 27, 2020
2 parents eb4b607 + 79a8714 commit 358c018
Show file tree
Hide file tree
Showing 184 changed files with 2,719 additions and 483 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ a
b
notify
publish-files
publish-dev
update-all
16 changes: 16 additions & 0 deletions Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
20200327:
- UPnP/DLNA source
- analogue input: auto-enable input on signal
- support setting maximum volume and mono/stereo mode for non-DSP sound cards
- equalizer settings: A/B comparisson
- support delay for DSP channels
- named listening modes can be stored and activated
- added automatic updates
- improved metadata handling with radio stations
- Squeezelite: Allow setting server address
- allow to reduce dynamic range of volume control (only backend)
- Several other bugfixes and improvements

20260226:
- Bugfix: Spotify configuration

20200225:
- Bugfix: ympd not using IPv6
- Bugfix: no uppercase letters in hostname
Expand Down
10 changes: 9 additions & 1 deletion build-config
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,15 @@ done
if [ "$2" == "release" ]; then
# for the releases, remove debug tools
for i in BR2_PACKAGE_STRESS BR2_PACKAGE_STRESS_NG BR2_PACKAGE_STRACE BR2_PACKAGE_TCPDUMP; do
echo "$i=n" >> $TMP
echo "$i=n" >> $TMP
done
for i in BR2_PACKAGE_CONFIGTXT_QUIET; do
echo "$i=y" >> $TMP
done
else
# use verbose mode for development release
for i in BR2_PACKAGE_CONFIGTXT_QUIET; do
echo "$i=n" >> $TMP
done
fi

Expand Down
2 changes: 1 addition & 1 deletion build-release
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ clear
echo Buildung for Raspberry Pi $1
echo ============================
echo
./build-config $1
./build-config $1 release
./clean $1
./compile $1
./create-image $1 $TS
Expand Down
37 changes: 36 additions & 1 deletion buildroot/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,29 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/configtxt/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/raspi-wifi/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-systemd/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/watchdog/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/disable-samba/Config.in"

comment "Players"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/lmsmpris/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/spotifyd/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/raat/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-squeezelite/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-bluezalsa/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-gmrender/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-gstreamer/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dlnampris/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-shairport/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-local/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-alsamixer/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-gmusic/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-iris/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-mpd/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-mpris/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-musicbox-webclient/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-radionet/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-soundcloud/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mopidy-youtube/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-mpd/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-ympd/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/mpd-mpris/Config.in"
Expand All @@ -29,27 +44,47 @@ comment "Backend applications"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsptoolkit/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dspprofiles/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/audiocontrol2/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-postgres/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-measurements/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-analytics/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/smbtools/Config.in"

comment "GUI"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/beocreate/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/dsp-promo/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/enable-vc4kms/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-psplash/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-localbrowser/Config.in"

comment "Python modules"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-appdirs/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-bottle-websocket/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-bs4/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-cachetools/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-expiringdict/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-gevent/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-gevent-websocket/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-gmusicapi/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-gpsoauth/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-greenlet/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-gstreamer-player/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-keyboard/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-levenshtein/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-mechanicalsoup/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-mock/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-musicbrainz-ngs/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-oauth2client/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-proboscis/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pydbus/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pygobject/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pykka/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pyky040/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-pylast/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-tzupdate/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-uritools/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-usagedata/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-validictory/Config.in"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-youtube-dl/Config.in"

comment "Test tools"
source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-test/Config.in"
Expand Down
4 changes: 2 additions & 2 deletions buildroot/board/raspberrypi3/overlay/etc/fstab
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/dev/root / ext2 rw,noatime 0 1
/dev/root / ext4 rw,noatime 0 1
proc /proc proc defaults 0 0
devpts /dev/pts devpts defaults,gid=5,mode=620,ptmxmode=0666 0 0
tmpfs /dev/shm tmpfs mode=0777 0 0
tmpfs /tmp tmpfs mode=1777 0 0
tmpfs /run tmpfs mode=0755,nosuid,nodev 0 0
sysfs /sys sysfs defaults 0 0
/dev/mmcblk0p1 /boot vfat defaults 0 0
/dev/mmcblk0p1 /boot vfat defaults,noatime,quiet 0 2
132 changes: 132 additions & 0 deletions buildroot/buildroot-dev.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
diff -urb buildroot-dev/package/gobject-introspection/gobject-introspection.mk brdev-working/package/gobject-introspection/gobject-introspection.mk
--- buildroot-dev/package/gobject-introspection/gobject-introspection.mk 2020-03-20 07:35:48.783430050 +0000
+++ brdev-working/package/gobject-introspection/gobject-introspection.mk 2020-03-20 06:56:37.731416596 +0000
@@ -18,6 +18,8 @@
host-gobject-introspection \
host-prelink-cross \
host-qemu \
+ gstreamer1 \
+ gst1-plugins-base \
libffi \
libglib2 \
python3 \
@@ -56,6 +58,9 @@
GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=disabled
endif

+GOBJECT_INTROSPECTION_DEPENDENCIES += gstreamer1 gst1-plugins-base
+GOBJECT_INTROSPECTION_CONF_OPTS += -Dgstreamer1=enabled
+
# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
GOBJECT_INTROSPECTION_CONF_ENV = \
GI_SCANNER_DISABLE_CACHE=1
diff -urb buildroot-dev/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk brdev-working/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
--- buildroot-dev/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk 2020-03-20 07:35:48.787430009 +0000
+++ brdev-working/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk 2020-03-19 20:00:14.274281083 +0000
@@ -23,7 +23,7 @@
-Dwinks=disabled \
-Dandroidmedia=disabled \
-Dapplemedia=disabled \
- -Dintrospection=disabled \
+ -Dintrospection=enabled \
-Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \
-Dglib-checks=disabled
diff -urb buildroot-dev/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk brdev-working/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
--- buildroot-dev/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk 2020-03-20 07:35:48.787430009 +0000
+++ brdev-working/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk 2020-03-20 06:30:57.747235646 +0000
@@ -18,7 +18,7 @@
-Dglib-asserts=disabled \
-Dglib-checks=disabled \
-Dgtk_doc=disabled \
- -Dintrospection=disabled
+ -Dintrospection=enabled

# Options which require currently unpackaged libraries
GST1_PLUGINS_BASE_CONF_OPTS += \
@@ -32,7 +32,10 @@
GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=disabled
endif

-GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES)
+GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES) \
+ host-gstreamer1 \
+ host-gobject-introspection \
+ gobject-introspection

GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)

@@ -280,3 +283,5 @@
endif

$(eval $(meson-package))
+$(eval $(host-meson-package))
+
diff -urb buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk brdev-working/package/gstreamer1/gstreamer1/gstreamer1.mk
--- buildroot-dev/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-20 07:35:48.787430009 +0000
+++ brdev-working/package/gstreamer1/gstreamer1/gstreamer1.mk 2020-03-20 07:32:26.025498231 +0000
@@ -16,7 +16,7 @@
-Dtests=disabled \
-Dbenchmarks=disabled \
-Dgtk_doc=disabled \
- -Dintrospection=disabled \
+ -Dintrospection=enabled \
-Dglib-asserts=disabled \
-Dglib-checks=disabled \
-Dgobject-cast-checks=disabled \
@@ -31,11 +31,12 @@
host-bison \
host-flex \
host-pkgconf \
+ host-gobject-introspection \
libglib2 \
$(if $(BR2_PACKAGE_LIBUNWIND),libunwind) \
- $(if $(BR2_PACKAGE_VALGRIND),valgrind) \
$(TARGET_NLS_DEPENDENCIES)

GSTREAMER1_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)

$(eval $(meson-package))
+$(eval $(host-meson-package))
diff -urb buildroot-dev/package/nodejs/nodejs.mk brdev-working/package/nodejs/nodejs.mk
--- buildroot-dev/package/nodejs/nodejs.mk 2020-03-20 07:35:48.859429275 +0000
+++ brdev-working/package/nodejs/nodejs.mk 2020-03-19 06:30:08.960598003 +0000
@@ -63,7 +63,6 @@
--shared-openssl \
--shared-openssl-includes=$(HOST_DIR)/include/openssl \
--shared-openssl-libpath=$(HOST_DIR)/lib \
- --shared-zlib \
--no-cross-compiling \
--with-intl=small-icu \
)
diff -urb buildroot-dev/package/python-pycairo/python-pycairo.mk brdev-working/package/python-pycairo/python-pycairo.mk
--- buildroot-dev/package/python-pycairo/python-pycairo.mk 2020-03-20 07:35:48.899428867 +0000
+++ brdev-working/package/python-pycairo/python-pycairo.mk 2020-03-19 06:30:08.960598003 +0000
@@ -8,8 +8,16 @@
PYTHON_PYCAIRO_SOURCE = pycairo-$(PYTHON_PYCAIRO_VERSION).tar.gz
PYTHON_PYCAIRO_SITE = https://files.pythonhosted.org/packages/3c/1a/c0478ecab31baae50fda9956547788afbd0ca563adc52c9b03cab30f17eb
PYTHON_PYCAIRO_SETUP_TYPE = setuptools
-PYTHON_PYCAIRO_DEPENDENCIES = cairo
+PYTHON_PYCAIRO_DEPENDENCIES = cairo host-cairo
PYTHON_PYCAIRO_LICENSE = LGPL-2.1 or MPL-1.1
PYTHON_PYCAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1

+HOST_PYTHON_PYCAIRO_ENV = \
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+ PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+ PKG_CONFIG_SYSROOT_DIR="/" \
+ PKG_CONFIG_LIBDIR="$(HOST_DIR)/lib/pkgconfig:$(HOST_DIR)/share/pkgconfig"
+
$(eval $(python-package))
+$(eval $(host-python-package))
Only in brdev-working/utils: package
diff -urb buildroot-dev/utils/scanpypi brdev-working/utils/scanpypi
--- buildroot-dev/utils/scanpypi 2020-03-20 07:35:48.991427929 +0000
+++ brdev-working/utils/scanpypi 2020-03-19 08:42:35.293726023 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
"""

Utility for building Buildroot packages for existing PyPI packages
6 changes: 5 additions & 1 deletion buildroot/package/audiocontrol2/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ config BR2_PACKAGE_AUDIOCONTROL2
select BR2_PACKAGE_PYTHON_SETUPTOOLS
select BR2_PACKAGE_PYTHON_URLLIB3
select BR2_PACKAGE_PYTHON_KEYBOARD
select BR2_PACKAGE_PYTHON_PSYCOPG2
select BR2_PACKAGE_PYTHON_MUSICBRAINZ_NGS
select BR2_PACKAGE_PYTHON_LEVENSHTEIN
select BR2_PACKAGE_PYTHON_REQUESTS
select BR2_PACKAGE_PYTHON_EXPIRINGDICT
select BR2_PACKAGE_PYTHON_PYKY040
select BR2_PACKAGE_PYTHON_PYGOBJECT

2 changes: 0 additions & 2 deletions buildroot/package/audiocontrol2/audiocontrol2.conf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,5 @@ dt = 24
sw = 25
step = 5

[metadata:ac2.plugins.metadata.postgresql.MetadataPostgres]

[metadata:ac2.plugins.metadata.lametric.LaMetricPush]

5 changes: 4 additions & 1 deletion buildroot/package/audiocontrol2/audiocontrol2.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
################################################################################

AUDIOCONTROL2_VERSION = c99813a3a4f030374436484c5e53581d5afa88aa
AUDIOCONTROL2_VERSION = 248991249f990eb65a792dca0fa6a2ba0ad347d0
AUDIOCONTROL2_SITE = $(call github,hifiberry,audiocontrol2,$(AUDIOCONTROL2_VERSION))

define AUDIOCONTROL2_BUILD_CMDS
Expand All @@ -22,6 +22,9 @@ define AUDIOCONTROL2_INSTALL_TARGET_CMDS
endef

define AUDIOCONTROL2_INSTALL_INIT_SYSTEMD
if [ ! -f $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants ]; then \
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants; \
fi
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/override.conf \
$(TARGET_DIR)/etc/systemd/system/audiocontrol2.service.d/override.conf
$(INSTALL) -D -m 0644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/audiocontrol2/audiocontrol2.service \
Expand Down
2 changes: 1 addition & 1 deletion buildroot/package/audiocontrol2/audiocontrol2.service
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ After=sound.target dbus.service
[Service]
Type=notify
Environment=DBUS_SESSION_BUS_ADDRESS=unix:path=/run/dbus/system_bus_socket
Environment=/data/ac2plugins:/etc/audiocontrol2
Environment=PYTHONPATH=/data/ac2plugins:/etc/audiocontrol2
WorkingDirectory=/opt/audiocontrol2
ExecStartPre=/opt/hifiberry/bin/bootmsg "Starting AudioControl2"
ExecStart=/usr/bin/python3 /opt/audiocontrol2/audiocontrol2.py ${AUDIOCONTROL2_ARGS}
Expand Down
6 changes: 4 additions & 2 deletions buildroot/package/beocreate/beocreate.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
#
################################################################################

BEOCREATE_VERSION = 581cbe76e61850b46edd734470e4fed916aa8838
BEOCREATE_VERSION = f4ee1e69e093b5685f1bb913bc410cc340777555
BEOCREATE_SITE = $(call github,bang-olufsen,create,$(BEOCREATE_VERSION))
#BEOCREATE_DEPENDENCIES = host-dsptoolkit

#BEOCREATE_VERSION = 5b88b723788f8cf15cace8ee67b43ce035400702
#BEOCREATE_SITE = $(call github,hifiberry,create,$(BEOCREATE_VERSION))

define BEOCREATE_BUILD_CMDS
endef
Expand Down
3 changes: 3 additions & 0 deletions buildroot/package/btspeaker/Config.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ config BR2_PACKAGE_BTSPEAKER
select BR2_PACKAGE_HIFIBERRY_BLUEZALSA
select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT
select BR2_PACKAGE_BLUEZ5_UTILS
select BR2_PACKAGE_BLUEZ5_UTILS_CLIENT
select BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED
select BR2_PACKAGE_DBUS
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_DBUS_PYTHON
select BR2_PACKAGE_FDK_AAC
4 changes: 2 additions & 2 deletions buildroot/package/btspeaker/a2dp-agent.service
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[Unit]
Description=Bluetooth A2DP agent
Requires=bluetooth.service
After=bluetooth.service
Requires=bluetooth.service btuart.service
After=bluetooth.service btuart.service

[Service]
ExecStart=/opt/btspeaker/a2dp-agent.py
Expand Down
1 change: 1 addition & 0 deletions buildroot/package/configtxt/cmdline.verbose
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
root=/dev/mmcblk0p2 rootwait console=tty1
9 changes: 9 additions & 0 deletions buildroot/package/configtxt/configtxt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,21 @@ define CONFIGTXT_INSTALL_TARGET_CMDS
endef

define CONFIGTXT_QUIET_INSTALL_TARGET_CMDS
echo "INstalling quiet cmdline.txt"
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/configtxt/cmdline.quiet \
$(BINARIES_DIR)/rpi-firmware/cmdline.txt
endef

define CONFIGTXT_VERBOSE_INSTALL_TARGET_CMDS
echo "Installing verbose cmdline.txt"
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_HIFIBERRY_PATH)/package/configtxt/cmdline.verbose \
$(BINARIES_DIR)/rpi-firmware/cmdline.txt
endef

ifeq ($(BR2_PACKAGE_CONFIGTXT_QUIET),y)
CONFIGTXT_POST_INSTALL_TARGET_HOOKS += CONFIGTXT_QUIET_INSTALL_TARGET_CMDS
else
CONFIGTXT_POST_INSTALL_TARGET_HOOKS += CONFIGTXT_VERBOSE_INSTALL_TARGET_CMDS
endif

$(eval $(generic-package))
Expand Down
6 changes: 6 additions & 0 deletions buildroot/package/disable-samba/Config.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
config BR2_PACKAGE_DISABLE_SAMBA
bool "disable-samba"
help
do not start smbd
depends on BR2_PACKAGE_SAMBA4

Loading

0 comments on commit 358c018

Please sign in to comment.