Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup. Remove deprecated build targets #3148

Merged
merged 11 commits into from
Jan 5, 2022
Merged

Cleanup. Remove deprecated build targets #3148

merged 11 commits into from
Jan 5, 2022

Conversation

EvilOlaf
Copy link
Member

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Jira reference number [AIO-2]

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • Test A
  • Test B

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@Heisath
Copy link
Member

Heisath commented Oct 16, 2021

Please keep helios4. I will maintain that together with whole mvebu (not 64) family. (So helios4, clearfogpro, clearfogbase)

@EvilOlaf
Copy link
Member Author

I need to revisit this list anyways before merging since more maintainers are found in the meantime

@igorpecovnik igorpecovnik mentioned this pull request Oct 18, 2021
Merged
2 tasks
@EvilOlaf
Update targets.conf
512cb1f 
Update targets according ot current status of maintainer list
reduce userspaces to Focal
reduce to xfce default desktop
keep one minimal and one edge to check if they build at least.
@EvilOlaf EvilOlaf marked this pull request as ready for review October 28, 2021 09:04
3nprob
3nprob reviewed Nov 2, 2021
View reviewed changes
config/targets.conf Outdated
nanopi-r4s current buster cli stable yes
nanopi-r4s current bullseye cli stable yes
#nanopi-r4s current buster cli stable yes
#nanopi-r4s current bullseye cli stable yes
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reasoning behind dropping debian while keeping ubuntu? Is it the preference of the currently assigned maintainer? Can a maintainer choose to only support one or the other? Before I fill in the form and pick SBCs it would be useful to understand the process here.

Copy link
Member

@Heisath Heisath Nov 2, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reasoning was to lower workload by only having one flavour supported anymore.
At the last release meeting (https://forum.armbian.com/topic/19104-armbian-2111-sambar-release-thread/?tab=comments#comment-129792) it was discussed, and as there did not seem to be a clear preference for debian/ubuntu, one of them (ubuntu) was just arbitrarily picked.

It would surely be possible and make sense to let the maintainer have a word on this. Also note these changes are definitely not final - thats why we do the release meetings, every few months, to reevaluate changes and discuss further direction.
Log of last meeting:
http://meeting.armbian.de/armbian.2021-10-16-14.01.html
http://meeting.armbian.de/armbian.2021-10-16-14.01.log.html

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Board maintainers are always free to add flavors as they like. However by default only one is shipped as mentioned.

Copy link

@3nprob 3nprob Nov 5, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to put a poll on the forum for users if they would prefer supported cli images to be debian or ubuntu, given one of them?

As you say maintainers will of course have final word, but at least it can provide input in case there's a clear wider community preference for one over the other. (Personally I'd be strongly for debian)

@igorpecovnik
Copy link
Member

/rebase

@github-actions github-actions bot added the c:bsp label Nov 14, 2021
@EvilOlaf EvilOlaf removed the c:bsp label Nov 14, 2021
@EvilOlaf EvilOlaf changed the title Remove CSC/EOS/TVB from build targets [DO NOT MERGE] Remove CSC/EOS/TVB from build targets Dec 3, 2021
@github-actions github-actions bot added the c:bsp label Jan 3, 2022
@igorpecovnik igorpecovnik changed the title [DO NOT MERGE] Remove CSC/EOS/TVB from build targets Cleanup build targets. Remove deprecated build targets Jan 3, 2022
@igorpecovnik igorpecovnik changed the title Cleanup build targets. Remove deprecated build targets Cleanup. Remove deprecated build targets Jan 3, 2022
@igorpecovnik
Copy link
Member

@paolosabatino @janprunk @EvilOlaf When you find some time, please briefly check if I have removed too much.

@EvilOlaf
Copy link
Member Author

EvilOlaf commented Jan 3, 2022

Looks good from a quick look

@lanefu
Copy link
Member

lanefu commented Jan 3, 2022

LGTM

@paolosabatino
Copy link
Contributor

@igorpecovnik That's ok for me! I was planning to reorganize the rk322x images sooner or later, but it is fine this way for now.

@igorpecovnik igorpecovnik merged commit 9d8a424 into master Jan 5, 2022
@igorpecovnik igorpecovnik deleted the AIO-2 branch January 5, 2022 16:55
rpardini pushed a commit to rpardini/armbian-build that referenced this pull request Jan 7, 2022
@catalinii @rpardini
ALL THE TO-BE MERGED COMMITS
f18a7bf 
add ssv6051 driver for kernel 5.10 and 5.15

(cherry picked from commit f3388b9)

Add upstream patches (armbian#3380)

(cherry picked from commit d7794cc)

Fixes for Github Actions (armbian#3379)

* Update build-beta-images.yml

* Update build-kernel-on-merge-request.yml

* Update build-train.yml

(cherry picked from commit 6bfc83b)

Refactor armbian-bsp-cli package creation (armbian#3378)

* Refactor armbian-bsp-cli package creation

- added general distro status for all in separate file inside BSP
- remove branch and distro specifics

* Looking for prebuild pack

* Small fixes

(cherry picked from commit 310495d)

Cleanup. Remove deprecated build targets (armbian#3148)

* Update targets.conf

* Update targets-desktop-beta.conf

* Update targets-cli-beta.conf

* Update targets.conf

Update targets according ot current status of maintainer list
reduce userspaces to Focal
reduce to xfce default desktop
keep one minimal and one edge to check if they build at least.

* adjust support status according current maintainer sheet

* Readd pbp

* Readd pbp

* Readd C2

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
(cherry picked from commit 9d8a424)

prepare_host: Installing packages with the install_pkg_deb function (armbian#3374)

* separate joint and own lists for architecture

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* Remove duplicate selection

* Final add Installing build dependencies

* libncurses: Do not use transitional package

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* add arch i386: Remove duplicate selection

* lib32ncurses-dev: Dependency only for amd64

* install_pkg_deb: parameter verbose to log

(cherry picked from commit 0282567)

Improve fist login UX (armbian#3375)

* Improve 1st login script

* Update packages/bsp/common/usr/lib/armbian/armbian-firstlogin

Co-authored-by: Manuel Rüger <manuel@rueg.eu>

* Address accessibility issue

Co-authored-by: Manuel Rüger <manuel@rueg.eu>
(cherry picked from commit e76a5b0)

fixes the manual launch of the installation script from USB media (armbian#3377)

(cherry picked from commit 3f8da05)

Bugfix - legacy kernels doesn't want to play nice with kernel options

When NFSD is enabled as module, kernel does not compile. But it works as build in. Since its pretty pointless to fix in the code, lets use this workaround.

FYI @patrickbkr

(cherry picked from commit 2b4e9e6)

Unify NFS configuration (armbian#3376)

* Unify NFS configuration
* Fix rk35xx kernel

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
(cherry picked from commit 7698848)

Limit sunxi-tools install to Allwinner family only

Close armbian#2941

(cherry picked from commit 181d0e2)

Re-enable rock-3a building now that it works (armbian#3373)

Revert a change in bddce2c now that rock-3a building succeeds and provides a usable image (armbian#3271)

(cherry picked from commit 32dc244)

sun50iw9 - bugfix - change phy driver to build-in since it breaks compilation when added as module

(cherry picked from commit 5a6b9b2)

Install debian packages using a special function (armbian#3368)

* Add new function install_pkg_deb

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* Use the install_pkg_deb function

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* sunxi-tools: Calculate build dependencies

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* hostapd, hostapd-realtek: Calculate build dependencies

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>

* Clean Environment for building as default

* upgrading: Repack a clean Environment archive

Signed-off-by: The-going <48602507+The-going@users.noreply.github.com>
(cherry picked from commit fedc9c1)

fix kernel legacy for firefly-rk3399 (armbian#3369)

(cherry picked from commit e453e4d)

add station m2\p2 (armbian#3352)

(cherry picked from commit 08568a6)

Bump version to proceed on 22.02 Armbian Ratel

(cherry picked from commit 483c055)

Assemble needed runs into a GH Actions build train (armbian#3366)

(cherry picked from commit 7f556dc)

helios64: fix udev rules to let fancontrol work again (armbian#3367)

(cherry picked from commit 37662d8)

Fix the uboot for rock-3a (armbian#3271)

* Sync kernel config with radxa and remove packaging patch

* Merge the rockchip64 legacy config as well

* Lower priority of EFI partitioning against DOS partitioning which is used by Armbian

Co-authored-by: Catalin Toda <catalinii@yahoo.com>
(cherry picked from commit f6143ef)
useful64 pushed a commit to useful64/build that referenced this pull request Feb 4, 2022
@EvilOlaf @igorpecovnik
Cleanup. Remove deprecated build targets (armbian#3148)
24c6162 
* Update targets.conf

* Update targets-desktop-beta.conf

* Update targets-cli-beta.conf

* Update targets.conf

Update targets according ot current status of maintainer list
reduce userspaces to Focal
reduce to xfce default desktop
keep one minimal and one edge to check if they build at least.

* adjust support status according current maintainer sheet

* Readd pbp

* Readd pbp

* Readd C2

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
useful64 pushed a commit to useful64/build that referenced this pull request Feb 4, 2022
@EvilOlaf @igorpecovnik
Cleanup. Remove deprecated build targets (armbian#3148)
cb81e5a 
* Update targets.conf

* Update targets-desktop-beta.conf

* Update targets-cli-beta.conf

* Update targets.conf

Update targets according ot current status of maintainer list
reduce userspaces to Focal
reduce to xfce default desktop
keep one minimal and one edge to check if they build at least.

* adjust support status according current maintainer sheet

* Readd pbp

* Readd pbp

* Readd C2

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Heisath Heisath Heisath left review comments

@3nprob 3nprob 3nprob left review comments

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@EvilOlaf @Heisath @igorpecovnik @lanefu @paolosabatino @3nprob