Commit graph

9012 commits

Author SHA1 Message Date
armbianworker
68feef5495 Merge branch 'desktop' into nightly-desktop 2021-02-24 00:47:25 +00:00
armbianworker
ea2f68b696 Merge remote-tracking branch 'origin/desktop' into desktop 2021-02-24 00:47:23 +00:00
Igor Pecovnik
e9125010fa Update configs 2021-02-24 01:46:53 +01:00
armbianworker
ee9c5c0003 Merge branch 'desktop' into nightly-desktop 2021-02-24 00:22:02 +00:00
armbianworker
7c4693bfd9 Merge remote-tracking branch 'origin/desktop' into desktop 2021-02-24 00:22:02 +00:00
Igor Pecovnik
585600a2b0 Add gnome-screenshot 2021-02-24 01:21:36 +01:00
Igor Pecovnik
6f843ef450 Merge branch 'desktop' into nightly-desktop 2021-02-24 01:18:56 +01:00
armbianworker
36a625d734 Merge remote-tracking branch 'origin/desktop' into desktop 2021-02-24 00:16:05 +00:00
armbianworker
3ef40bc252 Merge branch 'master' into desktop 2021-02-24 00:16:04 +00:00
Igor Pečovnik
9a1a9c31c7
Update targets-cli-beta.conf 2021-02-24 00:57:48 +01:00
Richard Neese
b0fcd830a7
Desktop (#2660)
* cli beta update

* Update targets-cli-beta.conf

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
2021-02-24 00:54:08 +01:00
Igor Pecovnik
a47e23ff2f Merge branch 'master' into desktop 2021-02-24 00:20:59 +01:00
Igor Pecovnik
f4e702d6f7 Move main version up
Previous version were already branched
https://github.com/armbian/build/tree/v21.02
2021-02-24 00:20:34 +01:00
Igor Pecovnik
f3bef8286b Move main version up
Previous version were already branched
https://github.com/armbian/build/tree/v21.02
2021-02-24 00:17:36 +01:00
armbianworker
dc289e0797 Bumping to new version
Adding following kernels:

linux-image-current-odroidxu4_21.02.0-trunk.136_armhf.deb
linux-image-current-sunxi_21.02.0-trunk.136_armhf.deb
linux-image-current-sunxi64_21.02.0-trunk.136_arm64.deb
linux-image-dev-sunxi_21.02.0-trunk.136_armhf.deb
linux-image-dev-sunxi64_21.02.0-trunk.136_arm64.deb
linux-image-legacy-odroidxu4_21.02.0-trunk.136_armhf.deb
2021-02-23 21:55:01 +00:00
armbianworker
1eeed9c9b0 Merge branch 'desktop' into nightly-desktop 2021-02-23 21:46:06 +00:00
armbianworker
e7b9acd5c0 Merge branch 'master' into desktop 2021-02-23 21:46:05 +00:00
Igor Pecovnik
789fe94137 Update broken upstream patches 2021-02-23 22:45:37 +01:00
armbianworker
38e92df410 Merge branch 'desktop' into nightly-desktop 2021-02-23 21:07:58 +00:00
armbianworker
7bd9ef84c4 Merge remote-tracking branch 'origin/desktop' into desktop 2021-02-23 21:07:58 +00:00
Igor Pecovnik
d466d233f8 Merge branch 'master' into desktop 2021-02-23 20:12:59 +01:00
armbianworker
c0589f1438 Merge branch 'desktop' into nightly-desktop 2021-02-23 18:50:51 +00:00
armbianworker
b6319a013e Merge branch 'master' into desktop 2021-02-23 18:50:50 +00:00
armbianworker
587d2814a7 Bumping to new version
Adding following kernels:

linux-image-current-sunxi_21.02.0-trunk.135_armhf.deb
linux-image-current-sunxi64_21.02.0-trunk.135_arm64.deb
linux-image-dev-odroidxu4_21.02.0-trunk.135_armhf.deb
linux-image-dev-sunxi_21.02.0-trunk.135_armhf.deb
linux-image-dev-sunxi64_21.02.0-trunk.135_arm64.deb
2021-02-23 18:35:36 +00:00
Igor Pecovnik
973407893a Maintenance: update configs and add upstream patches 2021-02-23 19:23:22 +01:00
armbianworker
ea85e126a7 Bumping to new version
Adding following kernels:

linux-image-current-imx6_21.02.0-trunk.134_armhf.deb
linux-image-current-meson_21.02.0-trunk.134_armhf.deb
linux-image-current-meson64_21.02.0-trunk.134_arm64.deb
linux-image-current-mvebu_21.02.0-trunk.134_armhf.deb
linux-image-current-mvebu64_21.02.0-trunk.134_arm64.deb
linux-image-current-rk322x_21.02.0-trunk.134_armhf.deb
linux-image-current-rockchip_21.02.0-trunk.134_armhf.deb
linux-image-current-rockchip64_21.02.0-trunk.134_arm64.deb
linux-image-dev-meson64_21.02.0-trunk.134_arm64.deb
linux-image-dev-mvebu_21.02.0-trunk.134_armhf.deb
linux-image-dev-mvebu64_21.02.0-trunk.134_arm64.deb
linux-image-dev-rockchip_21.02.0-trunk.134_armhf.deb
linux-image-dev-rockchip64_21.02.0-trunk.134_arm64.deb
linux-image-legacy-mt7623_21.02.0-trunk.134_armhf.deb
2021-02-23 16:19:19 +00:00
armbianworker
2eb695b2e4 Merge branch 'desktop' into nightly-desktop 2021-02-23 10:52:56 +00:00
armbianworker
90d6aeca56 Merge branch 'master' into desktop 2021-02-23 10:52:55 +00:00
Mi-cc5ec
4fa59fe0b3
* Corrected the order of WAN and LAN LEDs to correspond to the tag on the official metal case. (#2657)
Co-authored-by: chenchanglin1 <chenchanglin1@xiaomi.com>
2021-02-23 11:52:42 +01:00
armbianworker
0be47d1e14 Merge branch 'desktop' into nightly-desktop 2021-02-23 08:41:31 +00:00
armbianworker
1bad12ac55 Merge branch 'master' into desktop 2021-02-23 08:41:31 +00:00
Ash
ab60a86bd9
Do not overwrite EXIT_PATCHING_ERROR if already defined (#2652) 2021-02-23 09:41:19 +01:00
armbianworker
7f18fa3b0a Merge branch 'desktop' into nightly-desktop 2021-02-23 07:11:21 +00:00
armbianworker
8327234d32 Merge branch 'master' into desktop 2021-02-23 07:11:20 +00:00
Jannis
0b8b5f1de6
Merge pull request #2651 from armbian/AR-648
[AR-648] mvebu-dev: Adjust gpio-pwm patch
2021-02-23 08:11:07 +01:00
armbianworker
266c0b09eb Bumping to new version
Adding following kernels:

linux-image-current-rockchip64_21.02.0-trunk.133_arm64.deb
linux-image-dev-mvebu_21.02.0-trunk.133_armhf.deb
linux-image-dev-rockchip64_21.02.0-trunk.133_arm64.deb
linux-image-legacy-rk3399_21.02.0-trunk.133_arm64.deb
linux-image-legacy-rockchip64_21.02.0-trunk.133_arm64.deb
2021-02-23 03:24:37 +00:00
Igor Pecovnik
1087436ff2 Merge branch 'nightly-desktop' of github.com:armbian/build into nightly-desktop 2021-02-23 00:46:51 +00:00
armbianworker
f0d5bd45f9 Bumping to new version
Adding following kernels:

linux-image-current-rockchip64_21.02.0-trunk.132_arm64.deb
linux-image-dev-mvebu_21.02.0-trunk.132_armhf.deb
linux-image-dev-rockchip64_21.02.0-trunk.132_arm64.deb
linux-image-legacy-rk3399_21.02.0-trunk.132_arm64.deb
linux-image-legacy-rockchip64_21.02.0-trunk.132_arm64.deb
2021-02-23 00:43:33 +00:00
armbianworker
5b30440665 Merge remote-tracking branch 'origin/desktop' into desktop 2021-02-23 00:21:38 +00:00
armbianworker
b3b76a5fbd Merge branch 'desktop' into nightly-desktop 2021-02-23 00:21:38 +00:00
Miouyouyou
4b9e62fce0
Desktop/CLI build system : Moving arch/families/boards specificities to config/optional (#2648)
* Dockerfile: Fix uuidgen not found during build

By adding uuid-runtime to the list of packages to install.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* Refactor: Starting to remove duplicated code for list cleanup

That way we can use ONE function that actually works for
cleaning lists.
This list cleanup function lets people format their packages
lists like they want (spaces, tabs, carriage returns), making
them easier to maintain.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* Refactor: A bit more cleanup

Now, the code should start to be "readable" in configuration.sh,
while providing the abilities to setup packages files with tabs,
spaces, carriages returns and anything that can be recognized as
a "space" character.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* configuration: coherent board subdirs paths for CLI and Deboostrap

So now we have :
* debootstrap
* debootstrap/custom/boards/${BOARD}
* debootstrap/config_${CONFIG_SELECTED}
* debootstrap/config_${CONFIG_SELECTED}/custom/boards/${BOARD}

* main
* main/custom/boards/${BOARD}
* main/config_${SELECTED_CONFIGURATION}
* main/config_${SELECTED_CONFIGURATION}/custom/boards/${BOARD}

Which is coherent with how board specific subdirs work with
Desktop environments and appgroups.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* configuration: Fixed Debootstrap packages concat and PACKAGE_LIST_RM

The aggregation of Debootstrap packages list should not glue packages
names together now.

Also the PACKAGE_LIST_RM content will be added to the packages.remove
files content, instead of being overwritten by them.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* new_builder: Sourcing files from config/optional

This is still quite untested, since each test take roughly an hour
to execute. I'm currently retesting the addition of APT sources,
since the functions used have been modified.
Still, so far, it seems to works.

Anyway, the system has been modified to avoid, at much as possible,
the duplication of build related files, and put everything related
to specific boards inside a directory located at config/optional,
instead of putting this as a custom/boards subdirectory inside
desktop environments and appgroups.

So now, the base directories used to source build files are :

	${SRC}/config
	${SRC}/config/optional/_any_board/_configs
	${SRC}/config/optional/architectures/${ARCH}/_config
	${SRC}/config/optional/families/${LINUXFAMILY}/_config
	${SRC}/config/optional/boards/${BOARD}/_config

New subfolders have been added, to reduce the duplication :

* desktop/_all_distributions, cli/_all_distributions
  Sourced for all distributions, which should make it easier to
  put build files that are directly linked to any distribution
  (wallpapers packages, for example)
* desktop/${RELEASE}/environments/_all_environments,
  desktop/_all_distributions/environments/_all_environments
  When building for desktop, this is sourced for any desktop
  environment used.

With these additions, if you're building a desktop image, with
XFCE "base" as your default desktop environment, the system
will look for 'packages' files in these different paths :

config/desktop/_all_distributions/environments/_all_environments/packages
config/desktop/_all_distributions/environments/xfce/packages
config/desktop/_all_distributions/environments/xfce/config_base/packages
config/desktop/focal/environments/_all_environments/packages
config/desktop/focal/environments/xfce/packages
config/desktop/focal/environments/xfce/config_base/packages
config/optional/_any_board/_configs/desktop/_all_distributions/environments/_all_environments/packages
config/optional/_any_board/_configs/desktop/_all_distributions/environments/xfce/packages
config/optional/_any_board/_configs/desktop/_all_distributions/environments/xfce/config_base/packages
config/optional/_any_board/_configs/desktop/focal/environments/_all_environments/packages
config/optional/_any_board/_configs/desktop/focal/environments/xfce/packages
config/optional/_any_board/_configs/desktop/focal/environments/xfce/config_base/packages
config/optional/architectures/arm64/_config/desktop/_all_distributions/environments/_all_environments/packages
config/optional/architectures/arm64/_config/desktop/_all_distributions/environments/xfce/packages
config/optional/architectures/arm64/_config/desktop/_all_distributions/environments/xfce/config_base/packages
config/optional/architectures/arm64/_config/desktop/focal/environments/_all_environments/packages
config/optional/architectures/arm64/_config/desktop/focal/environments/xfce/packages
config/optional/architectures/arm64/_config/desktop/focal/environments/xfce/config_base/packages
config/optional/families/rockchip64/_config/desktop/_all_distributions/environments/_all_environments/packages
config/optional/families/rockchip64/_config/desktop/_all_distributions/environments/xfce/packages
config/optional/families/rockchip64/_config/desktop/_all_distributions/environments/xfce/config_base/packages
config/optional/families/rockchip64/_config/desktop/focal/environments/_all_environments/packages
config/optional/families/rockchip64/_config/desktop/focal/environments/xfce/packages
config/optional/families/rockchip64/_config/desktop/focal/environments/xfce/config_base/packages
config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/_all_environments/packages
config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/xfce/packages
config/optional/boards/nanopct4/_config/desktop/_all_distributions/environments/xfce/config_base/packages
config/optional/boards/nanopct4/_config/desktop/focal/environments/_all_environments/packages
config/optional/boards/nanopct4/_config/desktop/focal/environments/xfce/packages
config/optional/boards/nanopct4/_config/desktop/focal/environments/xfce/config_base/packages

That said, currently the configuration files that were put inside
custom/boards subdirectories are still not transferred to the new
directories.
This will be done in the next commit.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* new_builder: Moved custom/boards scripts to their new places

The paths... are getting longer actually, which isn't a good thing.
But I wanted to keep the same directory structure "config/desktop"
and "config/cli" structure inside the arch, families and boards
specific directories.

Anyway, the scripts are now factorized in single specific locations,
which reduce the amount of copy-paste and errors appearing here and
there.

That said, this remains to be actually tested, since I don't have
a Pinebook Pro.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>

* new_builder: Tested and approved... on Nano PC T4 only

I don't have a Pinebook anyway, so yeah.

Still, this works and this should allow maintainers to
put all the files related to a specific board builds,
in various specific folders, located in config/optional .

Note that you can actually put any file in the various
config/optional/{architectures,families,boards} subdirectories.
The subdirectory _config is named like this to avoid any
name conflict with other directories you might add.
So, for example, inside config/optional/boards/nanopct4,
you can add a subdirectory named 'desktop_skels' and
copy you various desktop default configurations from this
subdirectory.
I still leave the layout of these subdirectories up to
the various maintainers. The only subdirectory that is
actually sampled by the build scripts is "_config".

Additional package for appgroups, that are dependent of the
selected desktop environment, are now sampled from :

* desktop/_all_distributions/environments/${DESKTOP_ENVIRONMENT}/appgroups
* desktop/${RELEASE}/environments/${DESKTOP_ENVIRONMENT}/appgroups

This makes it easier to understand what packages will be
installed when selecting a desktop environment, instead of
having to check each individual appgroup subdirectory.
So everything related to a specific desktop environment stays
in its folder.

This change leads to 'custom' subdirectories being entirely useless,
which means that you should remove them now.

Anyway, I'm sure there are still parts I haven't checked,
so feel free to play with this and give it a try.

Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr>
2021-02-22 23:27:24 +01:00
Richard Neese
a1b61903bd
fixing budgie desktop background (#2656) 2021-02-22 23:00:21 +01:00
Igor Pecovnik
3c3fdc1142 Merge branch 'desktop' into nightly-desktop 2021-02-22 21:37:09 +00:00
Igor Pecovnik
d702c94b17 Merge branch 'master' into desktop 2021-02-22 21:36:42 +00:00
armbianworker
c8cc89d90b Merge branch 'desktop' into nightly-desktop 2021-02-22 21:36:09 +00:00
armbianworker
70d1df2570 Merge branch 'master' into desktop 2021-02-22 21:36:08 +00:00
Igor Pecovnik
32f018471f Revert "Internal: improve rootfs cache creation"
This reverts commit 04f8d5049d.
2021-02-22 22:35:49 +01:00
armbianworker
cd54b4afec Merge branch 'desktop' into nightly-desktop 2021-02-22 21:11:03 +00:00
armbianworker
e8c91afe68 Merge branch 'master' into desktop 2021-02-22 21:11:02 +00:00
armbianworker
55118edf96 Bumping to new version
Adding following kernels:

linux-image-legacy-rockchip64_21.02.0-trunk.131_arm64.deb
2021-02-22 20:55:49 +00:00