From e674f41d04e7442abbabbfceb7f8c5bb89d4dae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Tue, 20 Sep 2022 21:34:24 +0200 Subject: [PATCH] Small refactoring of 3rd party sources (#4211) - resolving bugfix - cleaning --- .../desktop/buster/appgroups/programming/packages | 2 -- config/desktop/focal/appgroups/programming/packages | 1 - .../appgroups/browsers}/packages | 1 - .../browsers}/sources/apt/google-chrome.gpg | Bin .../browsers}/sources/apt/google-chrome.source | 0 .../appgroups/programming/packages | 1 + .../appgroups/programming}/sources/apt/vscode.gpg | Bin .../programming}/sources/apt/vscode.source | 0 .../sources/apt/nvidia-drivers.gpg | Bin .../sources/apt/nvidia-drivers.source | 0 .../architectures/amd64/_config/desktop/bullseye | 1 - .../architectures/amd64/_config/desktop/focal | 1 - .../_all_environments/packages.uninstall | 3 --- .../sid/environments/_all_environments/packages | 1 - .../_all_environments/packages.uninstall | 2 -- .../sid/environments/_all_environments/sources | 1 - .../appgroups/programming/packages | 1 + .../appgroups/programming/sources/apt/vscodium.gpg | Bin .../programming/sources/apt/vscodium.source | 0 .../architectures/arm64/_config/desktop/bullseye | 1 - .../architectures/arm64/_config/desktop/focal | 1 - .../jammy/environments/_all_environments/only_for | 1 - .../jammy/environments/_all_environments/packages | 1 - .../architectures/arm64/_config/desktop/sid | 1 - .../cli/_all_distributions/main}/packages | 1 + .../_all_distributions/main}/sources/apt/box64.gpg | Bin .../main}/sources/apt/box64.source | 0 config/optional/architectures/armhf/_config | 1 + .../architectures/armhf/_config/desktop/bullseye | 1 - .../architectures/armhf/_config/desktop/focal | 1 - .../jammy/environments/_all_environments/only_for | 1 - .../jammy/environments/_all_environments/packages | 1 - .../architectures/armhf/_config/desktop/sid | 1 - .../cli/_all_distributions/main}/packages | 1 + .../_all_distributions/main}/sources/apt/box86.gpg | Bin .../main}/sources/apt/box86.source | 0 36 files changed, 5 insertions(+), 23 deletions(-) rename config/optional/architectures/amd64/_config/desktop/{jammy/environments/_all_environments => _all_distributions/appgroups/browsers}/packages (80%) rename config/optional/architectures/amd64/_config/desktop/{jammy/environments/_all_environments => _all_distributions/appgroups/browsers}/sources/apt/google-chrome.gpg (100%) rename config/optional/architectures/amd64/_config/desktop/{jammy/environments/_all_environments => _all_distributions/appgroups/browsers}/sources/apt/google-chrome.source (100%) create mode 100644 config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/packages rename config/optional/architectures/amd64/_config/desktop/{jammy/environments/_all_environments => _all_distributions/appgroups/programming}/sources/apt/vscode.gpg (100%) rename config/optional/architectures/amd64/_config/desktop/{jammy/environments/_all_environments => _all_distributions/appgroups/programming}/sources/apt/vscode.source (100%) rename config/optional/architectures/amd64/_config/desktop/{jammy => _all_distributions}/environments/_all_environments/sources/apt/nvidia-drivers.gpg (100%) rename config/optional/architectures/amd64/_config/desktop/{jammy => _all_distributions}/environments/_all_environments/sources/apt/nvidia-drivers.source (100%) delete mode 120000 config/optional/architectures/amd64/_config/desktop/bullseye delete mode 120000 config/optional/architectures/amd64/_config/desktop/focal delete mode 100644 config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages.uninstall delete mode 120000 config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages delete mode 100644 config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages.uninstall delete mode 120000 config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/sources create mode 100644 config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/packages rename config/{desktop/focal => optional/architectures/arm64/_config/desktop/_all_distributions}/appgroups/programming/sources/apt/vscodium.gpg (100%) rename config/{desktop/focal => optional/architectures/arm64/_config/desktop/_all_distributions}/appgroups/programming/sources/apt/vscodium.source (100%) delete mode 120000 config/optional/architectures/arm64/_config/desktop/bullseye delete mode 120000 config/optional/architectures/arm64/_config/desktop/focal delete mode 100644 config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for delete mode 100644 config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages delete mode 120000 config/optional/architectures/arm64/_config/desktop/sid rename config/optional/architectures/{armhf/_config/cli/_all_distributions/debootstrap/config_cli_standard => arm64/cli/_all_distributions/main}/packages (50%) rename config/optional/architectures/arm64/{_config/desktop/jammy/environments/_all_environments => cli/_all_distributions/main}/sources/apt/box64.gpg (100%) rename config/optional/architectures/arm64/{_config/desktop/jammy/environments/_all_environments => cli/_all_distributions/main}/sources/apt/box64.source (100%) create mode 120000 config/optional/architectures/armhf/_config delete mode 120000 config/optional/architectures/armhf/_config/desktop/bullseye delete mode 120000 config/optional/architectures/armhf/_config/desktop/focal delete mode 100644 config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/only_for delete mode 100644 config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/packages delete mode 120000 config/optional/architectures/armhf/_config/desktop/sid rename config/optional/architectures/{arm64/_config/cli/_all_distributions/debootstrap/config_cli_standard => armhf/cli/_all_distributions/main}/packages (50%) rename config/optional/architectures/armhf/{_config/desktop/jammy/environments/_all_environments => cli/_all_distributions/main}/sources/apt/box86.gpg (100%) rename config/optional/architectures/armhf/{_config/desktop/jammy/environments/_all_environments => cli/_all_distributions/main}/sources/apt/box86.source (100%) diff --git a/config/desktop/buster/appgroups/programming/packages b/config/desktop/buster/appgroups/programming/packages index 2d5e363d29..464eea8769 100644 --- a/config/desktop/buster/appgroups/programming/packages +++ b/config/desktop/buster/appgroups/programming/packages @@ -1,5 +1,3 @@ build-essential clang meld -codium -codium-insiders diff --git a/config/desktop/focal/appgroups/programming/packages b/config/desktop/focal/appgroups/programming/packages index 3cf275b190..c965e268ed 100644 --- a/config/desktop/focal/appgroups/programming/packages +++ b/config/desktop/focal/appgroups/programming/packages @@ -1,6 +1,5 @@ build-essential clang -codium geany meld regexxer diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/packages similarity index 80% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/packages index ec006ba663..988464c368 100644 --- a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages +++ b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/packages @@ -1,2 +1 @@ google-chrome-stable -code diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.gpg b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/sources/apt/google-chrome.gpg similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.gpg rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/sources/apt/google-chrome.gpg diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.source b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/sources/apt/google-chrome.source similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/google-chrome.source rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/browsers/sources/apt/google-chrome.source diff --git a/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/packages b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/packages new file mode 100644 index 0000000000..01b2d72fa7 --- /dev/null +++ b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/packages @@ -0,0 +1 @@ +code diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/vscode.gpg b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscode.gpg similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/vscode.gpg rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscode.gpg diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/vscode.source b/config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscode.source similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/vscode.source rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscode.source diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.gpg b/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/_all_environments/sources/apt/nvidia-drivers.gpg similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.gpg rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/_all_environments/sources/apt/nvidia-drivers.gpg diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.source b/config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/_all_environments/sources/apt/nvidia-drivers.source similarity index 100% rename from config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/sources/apt/nvidia-drivers.source rename to config/optional/architectures/amd64/_config/desktop/_all_distributions/environments/_all_environments/sources/apt/nvidia-drivers.source diff --git a/config/optional/architectures/amd64/_config/desktop/bullseye b/config/optional/architectures/amd64/_config/desktop/bullseye deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/bullseye +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/focal b/config/optional/architectures/amd64/_config/desktop/focal deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/focal +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages.uninstall b/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages.uninstall deleted file mode 100644 index 4702705006..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/jammy/environments/_all_environments/packages.uninstall +++ /dev/null @@ -1,3 +0,0 @@ -chromium-browser -codium -codium-insiders diff --git a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages b/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages deleted file mode 120000 index 7ab6b443c5..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages +++ /dev/null @@ -1 +0,0 @@ -../../../jammy/environments/_all_environments/packages \ No newline at end of file diff --git a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages.uninstall b/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages.uninstall deleted file mode 100644 index 3925956834..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/packages.uninstall +++ /dev/null @@ -1,2 +0,0 @@ -chromium -codium diff --git a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/sources b/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/sources deleted file mode 120000 index d18b5dae54..0000000000 --- a/config/optional/architectures/amd64/_config/desktop/sid/environments/_all_environments/sources +++ /dev/null @@ -1 +0,0 @@ -../../../jammy/environments/_all_environments/sources \ No newline at end of file diff --git a/config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/packages b/config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/packages new file mode 100644 index 0000000000..5b89f147be --- /dev/null +++ b/config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/packages @@ -0,0 +1 @@ +codium diff --git a/config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg b/config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscodium.gpg similarity index 100% rename from config/desktop/focal/appgroups/programming/sources/apt/vscodium.gpg rename to config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscodium.gpg diff --git a/config/desktop/focal/appgroups/programming/sources/apt/vscodium.source b/config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscodium.source similarity index 100% rename from config/desktop/focal/appgroups/programming/sources/apt/vscodium.source rename to config/optional/architectures/arm64/_config/desktop/_all_distributions/appgroups/programming/sources/apt/vscodium.source diff --git a/config/optional/architectures/arm64/_config/desktop/bullseye b/config/optional/architectures/arm64/_config/desktop/bullseye deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/arm64/_config/desktop/bullseye +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/arm64/_config/desktop/focal b/config/optional/architectures/arm64/_config/desktop/focal deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/arm64/_config/desktop/focal +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for deleted file mode 100644 index d400067581..0000000000 --- a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/only_for +++ /dev/null @@ -1 +0,0 @@ -arm64 diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages b/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages deleted file mode 100644 index d248784d68..0000000000 --- a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/packages +++ /dev/null @@ -1 +0,0 @@ -box64 diff --git a/config/optional/architectures/arm64/_config/desktop/sid b/config/optional/architectures/arm64/_config/desktop/sid deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/arm64/_config/desktop/sid +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/armhf/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages b/config/optional/architectures/arm64/cli/_all_distributions/main/packages similarity index 50% rename from config/optional/architectures/armhf/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages rename to config/optional/architectures/arm64/cli/_all_distributions/main/packages index 478991ee1e..25091b4637 100644 --- a/config/optional/architectures/armhf/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages +++ b/config/optional/architectures/arm64/cli/_all_distributions/main/packages @@ -1 +1,2 @@ +box64 gpiod diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.gpg b/config/optional/architectures/arm64/cli/_all_distributions/main/sources/apt/box64.gpg similarity index 100% rename from config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.gpg rename to config/optional/architectures/arm64/cli/_all_distributions/main/sources/apt/box64.gpg diff --git a/config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source b/config/optional/architectures/arm64/cli/_all_distributions/main/sources/apt/box64.source similarity index 100% rename from config/optional/architectures/arm64/_config/desktop/jammy/environments/_all_environments/sources/apt/box64.source rename to config/optional/architectures/arm64/cli/_all_distributions/main/sources/apt/box64.source diff --git a/config/optional/architectures/armhf/_config b/config/optional/architectures/armhf/_config new file mode 120000 index 0000000000..d920d185c9 --- /dev/null +++ b/config/optional/architectures/armhf/_config @@ -0,0 +1 @@ +../arm64/_config \ No newline at end of file diff --git a/config/optional/architectures/armhf/_config/desktop/bullseye b/config/optional/architectures/armhf/_config/desktop/bullseye deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/armhf/_config/desktop/bullseye +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/armhf/_config/desktop/focal b/config/optional/architectures/armhf/_config/desktop/focal deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/armhf/_config/desktop/focal +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/only_for b/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/only_for deleted file mode 100644 index 07f16e7623..0000000000 --- a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/only_for +++ /dev/null @@ -1 +0,0 @@ -armhf diff --git a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/packages b/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/packages deleted file mode 100644 index 66947a018c..0000000000 --- a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/packages +++ /dev/null @@ -1 +0,0 @@ -box86 diff --git a/config/optional/architectures/armhf/_config/desktop/sid b/config/optional/architectures/armhf/_config/desktop/sid deleted file mode 120000 index c17ec919b5..0000000000 --- a/config/optional/architectures/armhf/_config/desktop/sid +++ /dev/null @@ -1 +0,0 @@ -jammy \ No newline at end of file diff --git a/config/optional/architectures/arm64/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages b/config/optional/architectures/armhf/cli/_all_distributions/main/packages similarity index 50% rename from config/optional/architectures/arm64/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages rename to config/optional/architectures/armhf/cli/_all_distributions/main/packages index 478991ee1e..e47fe082d6 100644 --- a/config/optional/architectures/arm64/_config/cli/_all_distributions/debootstrap/config_cli_standard/packages +++ b/config/optional/architectures/armhf/cli/_all_distributions/main/packages @@ -1 +1,2 @@ +box86 gpiod diff --git a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/sources/apt/box86.gpg b/config/optional/architectures/armhf/cli/_all_distributions/main/sources/apt/box86.gpg similarity index 100% rename from config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/sources/apt/box86.gpg rename to config/optional/architectures/armhf/cli/_all_distributions/main/sources/apt/box86.gpg diff --git a/config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/sources/apt/box86.source b/config/optional/architectures/armhf/cli/_all_distributions/main/sources/apt/box86.source similarity index 100% rename from config/optional/architectures/armhf/_config/desktop/jammy/environments/_all_environments/sources/apt/box86.source rename to config/optional/architectures/armhf/cli/_all_distributions/main/sources/apt/box86.source