Skip to content

Commit 7247f4b

Browse files
authored
[Checkbox-ce-oem] Remove packaging alsa-utils and use the one in the system (Bugfix) (#1991)
* Remove packaging alsa-utils and use the one in the system * Export alsa config from system path * Add back alsa-utils for testing
1 parent bccf373 commit 7247f4b

File tree

6 files changed

+3
-6
lines changed

6 files changed

+3
-6
lines changed

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/launchers/wrapper_local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/
3333
export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
3434
export PATH="$PATH:$SNAP/usr/bin:$SNAP/usr/sbin:$SNAP/sbin:/snap/bin"
3535
export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
36+
export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf:/usr/share/alsa/pcm/default.conf
3637

3738
if [ -e $RUNTIME/wrapper_common_classic ]; then
3839
. $RUNTIME/wrapper_common_classic

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic20/snap/snapcraft.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ parts:
3838
source: checkbox-provider-ce-oem
3939
source-type: local
4040
stage-packages:
41-
- alsa-utils
4241
- mtd-utils
4342
- u-boot-tools
4443
- v4l-utils
@@ -47,7 +46,6 @@ parts:
4746
- snmp
4847
override-prime: |
4948
snapcraftctl prime
50-
rm lib/systemd/system/alsa-utils.service
5149
override-build: |
5250
export PYTHONPATH=/snap/checkbox20/current/lib/python3.8/site-packages/
5351
for path in $(find "/snap/checkbox20/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/launchers/wrapper_local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/
3333
export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
3434
export PATH="$PATH:$SNAP/usr/bin:$SNAP/usr/sbin:$SNAP/sbin:/snap/bin"
3535
export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
36+
export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf:/usr/share/alsa/pcm/default.conf
3637

3738
if [ -e $RUNTIME/wrapper_common_classic ]; then
3839
. $RUNTIME/wrapper_common_classic

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic22/snap/snapcraft.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ parts:
3838
source: checkbox-provider-ce-oem
3939
source-type: local
4040
stage-packages:
41-
- alsa-utils
4241
- mtd-utils
4342
- u-boot-tools
4443
- v4l-utils
@@ -48,7 +47,6 @@ parts:
4847
- python3-rpyc
4948
override-prime: |
5049
snapcraftctl prime
51-
rm lib/systemd/system/alsa-utils.service
5250
override-build: |
5351
export PYTHONPATH=/snap/checkbox22/current/lib/python3.10/site-packages/
5452
for path in $(find "/snap/checkbox22/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/launchers/wrapper_local

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export PERL5LIB="$PERL5LIB:$SNAP/usr/lib/$ARCH/perl/$PERL_VERSION:$SNAP/usr/lib/
3333
export GI_TYPELIB_PATH=$SNAP/usr/lib/girepository-1.0:$SNAP/usr/lib/$ARCH/girepository-1.0
3434
export PATH="$PATH:$SNAP/usr/bin:$SNAP/usr/sbin:$SNAP/sbin:/snap/bin"
3535
export PYTHONPATH="$SNAP/usr/lib/python3/dist-packages:$PYTHONPATH"
36+
export ALSA_CONFIG_PATH=/usr/share/alsa/alsa.conf:/usr/share/alsa/pcm/default.conf
3637

3738
if [ -e $RUNTIME/wrapper_common_classic ]; then
3839
. $RUNTIME/wrapper_common_classic

contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ parts:
3838
source: checkbox-provider-ce-oem
3939
source-type: local
4040
stage-packages:
41-
- alsa-utils
4241
- mtd-utils
4342
- u-boot-tools
4443
- v4l-utils
@@ -48,7 +47,6 @@ parts:
4847
- python3-rpyc
4948
override-prime: |
5049
craftctl default
51-
rm lib/systemd/system/alsa-utils.service
5250
override-build: |
5351
export PYTHONPATH=/snap/checkbox24/current/lib/python3.12/site-packages/
5452
for path in $(find "/snap/checkbox24/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done

0 commit comments

Comments
 (0)