qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bugfixes and improvements for https://github.com/armbian/build/pull/3560 (#3571) 

Testet XFCE desktop builds on Focal, Jammy, Impish x86
This commit is contained in:
Igor Pečovnik 2022-03-25 21:05:16 +01:00 committed by GitHub
parent 03ef96715e
commit c96a9096c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
59 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source
View File

@ -1 +0,0 @@
deb [signed-by=/usr/share/keyrings/githubcli-archive-keyring.source.gpg] https://cli.github.com/packages stable main

0
config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli-archive-keyring.source.gpg → config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli.gpg
View File

1
config/desktop/_all_distributions/appgroups/programming/sources/apt/githubcli.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/githubcli.gpg] http://cli.github.com/packages stable main

0
config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source.gpg → config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.gpg
View File

2
config/desktop/focal/appgroups/3dsupport/sources/apt/oibaf.source
View File

@ -1 +1 @@
deb [signed-by=/usr/share/keyrings/oibaf.source.gpg] https://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main
deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ focal main

0
config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source.gpg → config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.gpg
View File

2
config/desktop/focal/appgroups/browsers/sources/apt/chromium-browser.source
View File

@ -1 +1 @@
deb [signed-by=/usr/share/keyrings/chromium-browser.source.gpg] https://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ focal main
deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ focal main

0
config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source.gpg → config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.gpg
View File

2
config/desktop/focal/appgroups/browsers/sources/apt/mozilla-team.source
View File

@ -1 +1 @@
deb [signed-by=/usr/share/keyrings/mozilla-team.source.gpg] https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ focal main
deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ focal main

0
config/desktop/focal/appgroups/programming/sources/apt/vscodium.source.gpg → config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg
View File

2
config/desktop/focal/appgroups/programming/sources/apt/vscodium.source
View File

@ -1 +1 @@
deb [signed-by=/usr/share/keyrings/vscodium.source.gpg] http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main
deb [signed-by=/usr/share/keyrings/vscodium.gpg] http://paulcarroty.gitlab.io/vscodium-deb-rpm-repo/debs/ vscodium main

1
config/desktop/impish/appgroups/3dsupport/packages Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/3dsupport/packages

BIN
config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.gpg Normal file
View File

Binary file not shown.

1
config/desktop/impish/appgroups/3dsupport/sources/apt/oibaf.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ impish main

1
config/desktop/impish/appgroups/browsers/armbian Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/armbian

1
config/desktop/impish/appgroups/browsers/debian Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/debian

1
config/desktop/impish/appgroups/browsers/packages Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/packages

BIN
config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.gpg Normal file
View File

Binary file not shown.

1
config/desktop/impish/appgroups/browsers/sources/apt/chromium-browser.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ impish main

BIN
config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.gpg Normal file
View File

Binary file not shown.

1
config/desktop/impish/appgroups/browsers/sources/apt/mozilla-team.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ impish main

1
config/desktop/impish/appgroups/chat Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/chat

1
config/desktop/impish/appgroups/desktop_tools Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/desktop_tools

1
config/desktop/impish/appgroups/editors Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/editors

1
config/desktop/impish/appgroups/email Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/email

1
config/desktop/impish/appgroups/internet Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/internet

1
config/desktop/impish/appgroups/multimedia Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/multimedia

1
config/desktop/impish/appgroups/office Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/office

1
config/desktop/impish/appgroups/programming Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/programming

1
config/desktop/impish/appgroups/remote_desktop Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/remote_desktop

1
config/desktop/jammy/appgroups/3dsupport/packages Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/3dsupport/packages

BIN
config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.gpg Normal file
View File

Binary file not shown.

1
config/desktop/jammy/appgroups/3dsupport/sources/apt/oibaf.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/oibaf.gpg] http://ppa.launchpadcontent.net/oibaf/graphics-drivers/ubuntu/ jammy main

1
config/desktop/jammy/appgroups/browsers/armbian Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/armbian

1
config/desktop/jammy/appgroups/browsers/debian Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/debian

1
config/desktop/jammy/appgroups/browsers/packages Symbolic link
View File

@ -0,0 +1 @@
../../../focal/appgroups/browsers/packages

BIN
config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.gpg Normal file
View File

Binary file not shown.

1
config/desktop/jammy/appgroups/browsers/sources/apt/chromium-browser.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/chromium-browser.gpg] http://ppa.launchpadcontent.net/saiarcot895/chromium-dev/ubuntu/ jammy main

BIN
config/desktop/jammy/appgroups/browsers/sources/apt/mozilla-team.gpg Normal file
View File

Binary file not shown.

1
config/desktop/jammy/appgroups/browsers/sources/apt/mozilla-team.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/mozilla-team.gpg] http://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/ jammy main

1
config/desktop/jammy/appgroups/chat Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/chat

1
config/desktop/jammy/appgroups/desktop_tools Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/desktop_tools

1
config/desktop/jammy/appgroups/editors Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/editors

1
config/desktop/jammy/appgroups/email Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/email

1
config/desktop/jammy/appgroups/internet Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/internet

1
config/desktop/jammy/appgroups/multimedia Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/multimedia

1
config/desktop/jammy/appgroups/office Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/office

1
config/desktop/jammy/appgroups/programming Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/programming

1
config/desktop/jammy/appgroups/remote_desktop Symbolic link
View File

@ -0,0 +1 @@
../../focal/appgroups/remote_desktop

2
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages
View File

@ -1 +1 @@
chrome
google-chrome-stable

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages.uninstall Normal file
View File

@ -0,0 +1 @@
chromium-browser

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source
View File

@ -1 +0,0 @@
deb [signed-by=/usr/share/keyrings/chrome.source.gpg arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main

0
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/chrome.source.gpg → config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.gpg
View File

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/google-chrome.gpg] http://dl.google.com/linux/chrome/deb/ stable main

BIN
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.gpg Normal file
View File

Binary file not shown.

1
config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.source Normal file
View File

@ -0,0 +1 @@
deb [signed-by=/usr/share/keyrings/nvidia-drivers.gpg] http://ppa.launchpad.net/graphics-drivers/ppa/ubuntu focal main

0
config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source.gpg → config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.gpg
View File

2
config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source
View File

@ -1 +1 @@
deb [signed-by=/usr/share/keyrings/box64.source.gpg] http://ryanfortner.github.io/box64-debs/debian ./
deb [signed-by=/usr/share/keyrings/box64.gpg] http://ryanfortner.github.io/box64-debs/debian ./

3
lib/desktop.sh
View File

@ -207,7 +207,8 @@ add_apt_sources() {
for apt_sources_dirpath in ${potential_paths}; do
if [[ -d "${apt_sources_dirpath}" ]]; then
for apt_source_filepath in "${apt_sources_dirpath}/"*.source; do
local new_apt_source="$(cat "${apt_source_filepath}")"
apt_source_filepath=$(echo $apt_source_filepath | sed -re 's/(^.*[^/])\.[^./]*$/\1/')
local new_apt_source="$(cat "${apt_source_filepath}.source")"
local apt_source_gpg_filepath="${apt_source_filepath}.gpg"
# extract filenames