Commit graph

965 commits

Author SHA1 Message Date
Igor Pecovnik
6f843ef450 Merge branch 'desktop' into nightly-desktop 2021-02-24 01:18:56 +01:00
Igor Pecovnik
d466d233f8 Merge branch 'master' into desktop 2021-02-23 20:12:59 +01: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
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
Igor Pecovnik
d702c94b17 Merge branch 'master' into desktop 2021-02-22 21:36:42 +00:00
Igor Pecovnik
32f018471f Revert "Internal: improve rootfs cache creation"
This reverts commit 04f8d5049d.
2021-02-22 22:35:49 +01:00
Lukas Pirl
4e25b7257b
remove mount option "nodiratime" where "noatime" is given (#2645)
mount option "noatime" implies "nodiratime", see, e.g.:
https://github.com/torvalds/linux/blob/v5.11/fs/inode.c#L1807-L1808
2021-02-22 21:49:04 +01:00
Werner
3558620459
Minor grammar fix, remove deprecated Bionic hint 2021-02-22 13:57:41 +01:00
Igor Pecovnik
9a0bed4d92 Merge branch 'master' into desktop 2021-02-22 12:01:57 +00:00
Igor Pecovnik
4713ab23b9 Internal - Add support for Hirsute build host
We need this at least for building more recent (test) targets
2021-02-22 11:56:48 +00:00
Igor Pecovnik
04f8d5049d Internal: improve rootfs cache creation 2021-02-20 00:48:44 +01:00
Pander
e7a7dd9338
proposal purging residual packages (#2644)
* proposal purging residual packages

* Bugfix

Co-authored-by: Igor Pečovnik <igorpecovnik@users.noreply.github.com>
2021-02-20 00:44:26 +01:00
Igor Pecovnik
42a944b27a Merge branch 'master' into desktop 2021-02-18 21:05:59 +01:00
Igor Pecovnik
28768f4878 Internal: cache recreation doesn't need terminal
This remove pointless error when running cache recreate
2021-02-18 21:03:51 +01:00
Igor Pecovnik
7b646a2ce3 Merge branch 'master' into desktop 2021-02-17 01:38:32 +01:00
Igor Pečovnik
54bc65b3bb
Bump DEV kernels to 5.11.y (#2636)
* Bump rockchip DEV 32b to 5.11.y

* Move mvebu64 DEV to 5.11.y

* Move Rockchip64 DEV to 5.11.y

Disabling general-rkvdec_nv15.patch - need more attention

* Add Meson DEV / Odroid C1

* Move OdroidXU4 DEV to tobetter's 5.11.y branch

* Bump sunxi DEV to 5.11.y

* Bump mvebu DEV to 5.11.y
2021-02-17 01:36:25 +01:00
armbianworker
899c7b6001 Merge branch 'master' into desktop 2021-02-15 15:30:52 +00:00
Igor Pečovnik
d28c170a23
RTL 8811CU: Add support for K5.11.y (#2638)
* RTL 8811cu: Add support for K5.11.y
* Update configs and remove deprecated patches
2021-02-15 16:25:19 +01:00
armbianworker
92e85800ba Merge branch 'master' into desktop 2021-02-15 12:20:30 +00:00
Igor Pečovnik
03e4f604d3
Fixing out of the tree wireless driver compilation (#2635)
* Fix compilating on 5.10.y / 5.11.y for Realtek 8188EU

* Cleanup
2021-02-15 13:19:40 +01:00
Igor Pečovnik
514d213a64
Attach wireless driver back to master branch (#2634)
Checked compilation with 5.11.y
2021-02-15 13:19:31 +01:00
JMCC
ea7b1c0559 desktop.sh: Add 'Provides: armbian-{release}-desktop' for backwards compatibility 2021-02-12 13:14:11 +01:00
Igor Pecovnik
01c0ad506d Merge branch 'master' into desktop 2021-02-03 22:09:22 +01:00
Igor Pečovnik
bb1384a52e
Desktop fails to start if auto login is disabled - lightdm-gtk-greeter bug (#2609)
* Apply a fix for lightdm-gtk-greeter bug

Applied at 1st run but can probably be moved to build

* Move fix rather to BSP so fix will be applied to upgrade
2021-02-03 20:17:36 +01:00
Lane Jennison
2c079df648 import correct deepin session from desktop branch 2021-01-31 20:53:42 +00:00
Lane Jennison
501e5974bc desktop installer fixes 2021-01-31 19:38:26 +00:00
Igor Pecovnik
1178c43e74 Build optimisations 2021-01-30 00:34:14 +01:00
Igor Pecovnik
1b0a582614 Merge branch 'desktop' of https://github.com/armbian/build into desktop 2021-01-30 00:33:22 +01:00
Igor Pecovnik
0dd7bc512e Merge branch 'master' into desktop 2021-01-30 00:33:06 +01:00
Igor Pečovnik
bf544c21f8
Display additional info to build log 2021-01-29 21:41:35 +01:00
Igor Pecovnik
4a986a8787 Backend - move version upgrade to separate functionality 2021-01-29 21:04:46 +01:00
Igor Pecovnik
4092428b2e Cache was rebuilt, bump version 2021-01-28 16:47:16 +01:00
Igor Pecovnik
172ff5f84d Fix install from repository for desktops
Nore: current packages at beta repo needs to be rebuild ...
2021-01-26 16:29:25 +01:00
Igor Pecovnik
065cfc6d48 Merge branch 'master' into desktop 2021-01-26 15:06:52 +01:00
Igor Pecovnik
8ba67b7537 Add armbian-zsh to the REPOSITORY_INSTALL packate list
If choosen, package from repository will be used
2021-01-26 15:05:33 +01:00
Igor Pecovnik
a504d799fe Small tweaks 2021-01-26 14:46:51 +01:00
Igor Pecovnik
e0be2b7564 Remove broken targets and cosmetic fix 2021-01-26 12:52:52 +01:00
Igor Pecovnik
2ce125e985 Bugfix for not creating BSP files and empty desktop package 2021-01-26 12:28:59 +01:00
Igor Pecovnik
5d2332f14c Merge branch 'master' into desktop 2021-01-25 13:25:06 +01:00
Igor Pecovnik
705bbd431b Bump rootfs cache - it was recreated
- tweak buil all images
- add more info to the error
2021-01-25 13:23:39 +01:00
Igor Pecovnik
3a05d54ba4 Merge branch 'master' into desktop 2021-01-24 21:33:32 +01:00
Igor Pecovnik
e2d5c3abfc Backend - don't compress more then one image at once
Compressing consumes a lot of memory we don't have. This tweaks should help to build much more images at once.
2021-01-24 21:30:25 +01:00
Igor Pecovnik
9799982ab7 Merge branch 'master' into desktop 2021-01-23 09:16:32 +01:00
Igor Pečovnik
315ca731f0
Fix shell selection bug in Bionic version (#2573) 2021-01-22 12:54:39 +01:00
Miouyouyou
712807108c
[DRAFT] Quick cleanups on the Desktop branch (#2551)
* 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>
2021-01-20 14:05:31 +01:00
Igor Pecovnik
f8120993c2 Merge branch 'master' into desktop 2021-01-20 12:26:15 +01:00
Igor Pečovnik
d95a4f7bf6
Enable AUFS back - its supported again (#2562)
* Enable AUFS back - its supported again

Tested building

* Update kernel configs for AUFS
2021-01-19 23:24:33 +01:00
Igor Pečovnik
5f350de697
Clean more Canonical services (#2563) 2021-01-19 23:23:47 +01:00
Igor Pecovnik
fca5451946 Bugfix: Only first app group was selected 2021-01-19 21:23:29 +01:00