Merge development (May release)

.gitignore

@@ -13,5 +13,4 @@ a
 b
 notify
 publish-files
-publish-dev
 update-all

Changelog

@@ -1,4 +1,10 @@
-202004xx:
+202005xx:
+- Local user interface running on the Pi (Pi3/4 only)
+- ALSA eq disabled by default
+- Several bugfixes and stability improvements
+- Internal: New updater that supports ZIP archives and F2FS file systems
+
+20200424:
 - Room equalization optimizer
 - interact: rule-based actions
 - 10-band Equalizer support for Non-DSP sound cards

build-config

@@ -18,7 +18,7 @@ echo $VERSION > $BRDIR/.piversion
 echo $VERSION > buildroot/PIVERSION
 
 if [[ "$2" == "" || "$2" == "release" ]]; then
- TEMPLATE=hifiberryos
+ TEMPLATE=hifiberryos-gui
 else
  TEMPLATE=$2
 fi
@@ -52,29 +52,49 @@ for i in BR2_PACKAGE_KVM_UNIT_TESTS BR2_PACKAGE_WF111 BR2_PACKAGE_XEN BR2_TARGET
  echo "$i=n" >> $TMP
 done
 
+# Always enable these
+for i in BR2_STRIP_strip; do
+ echo "$i=y" >> $TMP
+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
+ for i in `cat configs/devpackages` ; do
   echo "$i=n" >> $TMP
  done
- for i in BR2_PACKAGE_CONFIGTXT_QUIET; do
+ for i in BR2_PACKAGE_CONFIGTXT_QUIET BR2_STRIP; do
   echo "$i=y" >> $TMP
  done
 else
- # use verbose mode for development release
+ # use verbose mode for development release and larger file systems
  for i in BR2_PACKAGE_CONFIGTXT_QUIET; do
   echo "$i=n" >> $TMP
+  echo "BR2_TARGET_ROOTFS_EXT2_SIZE=\"900M\"" >> $TMP
+  echo "BR2_TARGET_ROOTFS_F2FS_SIZE=\"1000M\"" >> $TMP
  done
 fi
 
 # Roon and Spotify are not supported on the Pi Zero
 if [ "$VERSION" == "0w" ]; then
- for PKG in BR2_PACKAGE_RAAT BR2_PACKAGE_SPOTIF BR2_PACKAGE_ENABLE_ARM7; do
+ for PKG in BR2_PACKAGE_RAAT BR2_PACKAGE_SPOTIFY BR2_PACKAGE_ENABLE_ARM7; do
+   echo "$PKG=n" >> $TMP
+ done
+ for PKG in `cat configs/remove-slowpi`; do 
    echo "$PKG=n" >> $TMP
  done
  echo BR2_PACKAGE_HIFIBERRY_TOOLS_AUDIO_LITE=y >> $TMP
 fi
 
+# Remove some stuff from the Pi2 release"
+if [ "$VERSION" == "2" ]; then
+ for PKG in `cat configs/remove-slowpi`; do
+  echo "$PKG=n" >> $TMP
+ done
+fi 
+
+# Workaround
+echo "BR2_JLEVEL=16" >> $TMP
+
 mv $TMP $DST
 mv $DST $BRDIR/.config
 

buildroot/Config.in

@@ -59,7 +59,7 @@ source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-psplash/Config.in"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/hifiberry-localbrowser/Config.in"
 
 comment "Libraries"
-source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/caps/Config.in"
+#source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/caps/Config.in"
 
 comment "Python modules"
 source "$BR2_EXTERNAL_HIFIBERRY_PATH/package/python-appdirs/Config.in"
@@ -71,7 +71,6 @@ 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"

buildroot/board/raspberrypi/genimage-raspberrypi.cfg

@@ -0,0 +1,32 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2708-rpi-b.dtb",
+      "bcm2708-rpi-b-plus.dtb",
+      "bcm2708-rpi-cm.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi0.cfg

@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2708-rpi-zero.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi0w.cfg

@@ -0,0 +1,31 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2708-rpi-zero-w.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "rpi-firmware/overlays",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi2.cfg

@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2709-rpi-2-b.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi3-64.cfg

@@ -0,0 +1,33 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2710-rpi-3-b.dtb",
+      "bcm2710-rpi-3-b-plus.dtb",
+      "bcm2837-rpi-3-b.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "rpi-firmware/overlays",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi3.cfg

@@ -0,0 +1,33 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2710-rpi-3-b.dtb",
+      "bcm2710-rpi-3-b-plus.dtb",
+      "bcm2710-rpi-cm3.dtb",
+      "rpi-firmware/bootcode.bin",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
+      "rpi-firmware/overlays",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi4-64.cfg

@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2711-rpi-4-b.dtb",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
+      "Image"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi/genimage-raspberrypi4.cfg

@@ -0,0 +1,30 @@
+image boot.vfat {
+  vfat {
+    files = {
+      "bcm2711-rpi-4-b.dtb",
+      "rpi-firmware/cmdline.txt",
+      "rpi-firmware/config.txt",
+      "rpi-firmware/fixup4.dat",
+      "rpi-firmware/start4.elf",
+      "rpi-firmware/overlays",
+      "zImage"
+    }
+  }
+  size = 32M
+}
+
+image sdcard.img {
+  hdimage {
+  }
+
+  partition boot {
+    partition-type = 0xC
+    bootable = "true"
+    image = "boot.vfat"
+  }
+
+  partition rootfs {
+    partition-type = 0x83
+    image = "rootfs.ext4"
+  }
+}

buildroot/board/raspberrypi0w

@@ -0,0 +1 @@
+raspberrypi

buildroot/board/raspberrypi2

@@ -0,0 +1 @@
+raspberrypi

buildroot/board/raspberrypi3

@@ -0,0 +1 @@
+raspberrypi

buildroot/board/raspberrypi4

@@ -0,0 +1 @@
+raspberrypi