diff --git a/conf/layer.conf b/conf/layer.conf index 94228ad..c9f2664 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -15,7 +15,7 @@ LAYERSERIES_COMPAT_meta-diya = "walnascar" PACKAGE_CLASSES = "package_ipk" INHERIT += " rm_work " -DISTRO_FEATURES:append := " opengl pam systemd usrmerge ppp usbgadget wifi vulkan " +DISTRO_FEATURES:append := " opengl pam systemd usrmerge ppp usbgadget wifi vulkan alsa pulseaudio " DISTRO_FEATURES:remove = " x11 ptest sysvinit " DISTRO_FEATURES_BACKFILL_CONSIDERED += " sysvinit " VIRTUAL-RUNTIME_init_manager = "systemd" diff --git a/recipes-core/images/base-image.inc b/recipes-core/images/base-image.inc index 52d57c0..907f4d8 100644 --- a/recipes-core/images/base-image.inc +++ b/recipes-core/images/base-image.inc @@ -50,6 +50,15 @@ IMAGE_INSTALL:append = "kernel-modules \ coreutils \ glmark2 \ usb-gadget-diya \ + pulseaudio \ + pulseaudio-server \ + alsa-utils \ + pulseaudio-module-alsa-card \ + pulseaudio-module-alsa-source \ + pulseaudio-module-alsa-sink \ + pulseaudio-module-cli \ + pulseaudio-module-echo-cancel \ + pulseaudio-misc \ " # TOOLCHAIN_HOST_TASK:append = " libxkbcommon " diff --git a/recipes-core/volatile-binds/files/volatile-binds.service.in b/recipes-core/volatile-binds/files/volatile-binds.service.in new file mode 100644 index 0000000..38ca93e --- /dev/null +++ b/recipes-core/volatile-binds/files/volatile-binds.service.in @@ -0,0 +1,19 @@ +[Unit] +Description=Bind mount volatile @where@ +DefaultDependencies=no +Before=local-fs.target network.target +RequiresMountsFor=@whatparent@ @whereparent@ +ConditionPathIsReadWrite=|@whatparent@ +ConditionPathExists=|!@whatparent@ +ConditionPathExists=@where@ +ConditionPathIsReadWrite=!@where@ + +[Service] +Type=oneshot +RemainAfterExit=Yes +Environment=MOUNT_COPYBIND_AVOID_OVERLAYFS=@avoid_overlayfs@ +ExecStart=/sbin/mount-copybind @what@ @where@ +ExecStop=/bin/umount @where@ + +[Install] +WantedBy=local-fs.target diff --git a/recipes-core/volatile-binds/volatile-binds.bbappend b/recipes-core/volatile-binds/volatile-binds.bbappend new file mode 100644 index 0000000..5a32cd4 --- /dev/null +++ b/recipes-core/volatile-binds/volatile-binds.bbappend @@ -0,0 +1,2 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI += " file://volatile-binds.service.in " \ No newline at end of file diff --git a/recipes-devtools/usbnet-tools/files/pinephone-setup-usb-network b/recipes-devtools/usbnet-tools/files/pinephone-setup-usb-network index e517efd..5a76f27 100644 --- a/recipes-devtools/usbnet-tools/files/pinephone-setup-usb-network +++ b/recipes-devtools/usbnet-tools/files/pinephone-setup-usb-network @@ -19,4 +19,4 @@ fi # set up ip forward sysctl -w net.ipv4.ip_forward=1 -nmcli con up USB \ No newline at end of file +nmcli con up USB || true \ No newline at end of file diff --git a/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend new file mode 100644 index 0000000..d188393 --- /dev/null +++ b/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:append = " systemd dbus bluez5 gsettings jack " \ No newline at end of file