From 4f078495670dec0cbe96ee2b5b01d95ff831a950 Mon Sep 17 00:00:00 2001 From: Pander Date: Mon, 24 Apr 2023 19:02:23 +0200 Subject: [PATCH] Focal2jammy (#332) * consolidate PINE64 documentation * upgrade jammy to focal and buster to bullseye --- docs/Developer-Guide_Build-Preparation.md | 16 ++++++++-------- docs/Developer-Guide_Build-Process.md | 4 ++-- docs/Developer-Guide_Building-with-Docker.md | 6 +++--- docs/User-Guide_FAQ.md | 2 +- docs/User-Guide_Getting-Started.md | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/Developer-Guide_Build-Preparation.md b/docs/Developer-Guide_Build-Preparation.md index d33cb7de..31c7d991 100644 --- a/docs/Developer-Guide_Build-Preparation.md +++ b/docs/Developer-Guide_Build-Preparation.md @@ -48,7 +48,7 @@ You may edit it to your needs or create different configuration files using it a Alternatively you can supply options as command line parameters to compile.sh. Example: - ./compile.sh BOARD=cubietruck BRANCH=current KERNEL_ONLY=no RELEASE=focal + ./compile.sh BOARD=cubietruck BRANCH=current KERNEL_ONLY=no RELEASE=jammy Note: Option `BUILD_ALL` cannot be set to "yes" via command line parameter. Note: Names for `BOARD` can be found [here](https://github.com/armbian/build/tree/master/config/boards) by looking at file names. Example: OrangePi 4 = **orangepi4.conf** = `BOARD=orangepi4` @@ -61,7 +61,7 @@ You can create one base configuration (`config-base.conf`) and use this in desce . ./config-base.conf BRANCH="edge" -RELEASE="buster" +RELEASE="bullseye" COMPRESS_OUTPUTIMAGE="sha,gz" ``` @@ -85,8 +85,8 @@ This is a typical board configuration: MODULES_NEXT="brcmfmac bonding" # KERNEL_TARGET="legacy,current,edge" - CLI_TARGET="buster,focal:current" - DESKTOP_TARGET="buster:legacy,current" + CLI_TARGET="bullseye,jammy:current" + DESKTOP_TARGET="bullseye:legacy,current" CLI_BETA_TARGET="" DESKTOP_BETA_TARGET="" @@ -101,13 +101,13 @@ This is a typical board configuration: You can find more information about those variables [here](https://github.com/armbian/build/blob/master/config/boards/README.md). If you want that our automated system start making images for this particular board, you need to alter parameters `CLI_BETA_TARGET` and `DESKTOP_BETA_TARGET`. -Variants are dependent from `KERNEL_TARGET` definitions and supported userlands: `hirsute`, `focal`, `buster`. +Variants are dependent from `KERNEL_TARGET` definitions and supported userlands: `jammy`, `bullseye`. To edit those parameters you need to push changes to the build script. You need to [fork a project and create a pull request](Process_Contribute.md) and after it is imported by one of the administrators, images will start to show up in appropriate folder. -If you want to enable Debian buster desktop image with _current_ kernel choose the following: +If you want to enable Debian Bullseye desktop image with _current_ kernel choose the following: - DESKTOP_BETA_TARGET="buster:current" + DESKTOP_BETA_TARGET="bullseye:current" or for command line interfaces Ubuntu Focal based images with legacy kernel 4.19.x @@ -115,7 +115,7 @@ or for command line interfaces Ubuntu Focal based images with legacy kernel 4.19 or for image with latest upstream development/bleeding edge kernel. - DESKTOP_BETA_TARGET="buster:edge" + DESKTOP_BETA_TARGET="bullseye:edge" ## Using alternate armbian builder repos and branches diff --git a/docs/Developer-Guide_Build-Process.md b/docs/Developer-Guide_Build-Process.md index ff1186cb..8eac7a10 100644 --- a/docs/Developer-Guide_Build-Process.md +++ b/docs/Developer-Guide_Build-Process.md @@ -2,11 +2,11 @@ ## Build process summary: -- creates development environment on top of amd64 Ubuntu 20.04 LTS, +- creates development environment on top of amd64 Ubuntu 22.04 LTS, - downloads proven sources, applies patches on top and uses tested configurations, - cross-compiles universal boot loader (***U-Boot***), kernel and other tools and drivers, - packs kernel, U-Boot, dtb and root customizations into Debian packages, -- debootstraps minimalistic Debian Buster and Ubuntu Focal into SD card images, +- debootstraps minimalistic Debian Bullseye and Ubuntu Jammy into SD card images, - installs additional packets, applies customizations and shrinks image to its actual size. Check this image [compiling example](https://youtu.be/zeShf12MNLg) with partial cache. diff --git a/docs/Developer-Guide_Building-with-Docker.md b/docs/Developer-Guide_Building-with-Docker.md index e5cada00..66cf86e5 100644 --- a/docs/Developer-Guide_Building-with-Docker.md +++ b/docs/Developer-Guide_Building-with-Docker.md @@ -33,7 +33,7 @@ There are 3 options to start build process: ``` 3\. Interactively run inside docker container ``` -./compile.sh docker-shell BOARD=rockpi-4a BRANCH=edge RELEASE=focal +./compile.sh docker-shell BOARD=rockpi-4a BRANCH=edge RELEASE=jammy ``` The process creates and runs a named Docker container `armbian` with two named volumes `armbian-cache` and `armbian-ccache`, @@ -53,9 +53,9 @@ This mode also allows you to manually run individual steps of the build process. First, start docker-shell on the host build system: ``` -@droid:~/armbian$ ./compile.sh docker-shell RELEASE=buster BOARD=rockpi-4a BRANCH=edge +@droid:~/armbian$ ./compile.sh docker-shell RELEASE=bullseye BOARD=rockpi-4a BRANCH=edge ``` -From there, `RELEASE=buster BOARD=rockpi-4a BRANCH=edge` are passed into shell and will be set into +From there, `RELEASE=bullseye BOARD=rockpi-4a BRANCH=edge` are passed into shell and will be set into envirounment variables. Next, we can simply start building an image: diff --git a/docs/User-Guide_FAQ.md b/docs/User-Guide_FAQ.md index 2d241a7c..82df0020 100644 --- a/docs/User-Guide_FAQ.md +++ b/docs/User-Guide_FAQ.md @@ -84,7 +84,7 @@ However Armbian's way of building kernel images is slightly different than the s ## How do I upgrade from Armbian Buster to Bullseye? -Armbian does not offer a standardized way nor do we encourage users to upgrade their userspace like Bionic to Focal, Stretch to Buster, or Buster to Bullseye. We would love to do that but the reason why we cannot is simply the lack of ressources in time and devices to test such upgrades in random scenarios. +Armbian does not offer a standardized way nor do we encourage users to upgrade their userspace like Bionic to Focal, Focal to Jammy, Stretch to Buster, or Buster to Bullseye. We would love to do that but the reason why we cannot is simply the lack of ressources in time and devices to test such upgrades in random scenarios. You can try to upgrade your userspace by following official ways from Debian/Ubuntu but make sure to freeze your firmware packages via `armbian-config` beforehand. Also you will not receive any help from Armbian if something goes wrong or have other issues with an upgraded system. diff --git a/docs/User-Guide_Getting-Started.md b/docs/User-Guide_Getting-Started.md index 9f9e47ae..140304e8 100644 --- a/docs/User-Guide_Getting-Started.md +++ b/docs/User-Guide_Getting-Started.md @@ -27,9 +27,9 @@ The download for each image consists of three separate files: For each board we usually provide: -- one CLI server image with Debian Buster userspace -- one CLI server image with Ubuntu Focal userspace -- one desktop image with Ubuntu Focal userspace **or** Debian Buster userspace +- one CLI server image with Debian Bullseye userspace +- one CLI server image with Ubuntu Jammy userspace +- one desktop image with Ubuntu Jammy userspace **or** Debian Bullseye userspace Other unsupported builds may also be available (like Debian Stretch/Bullseye or Ubuntu Disco/Eoan/Hirsute).