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

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

Merged
merged 1 commit into from
Dec 31, 2021
Merged

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

merged 1 commit into from
Dec 31, 2021

Conversation

NexusXe
Copy link
Collaborator

@NexusXe NexusXe commented Dec 31, 2021 •
edited
Loading

Description

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

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.

  • Build and test full images
  • Build and test individual packages

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

@NexusXe
Re-enable rock-3a building now that it works
8a473fb 
Revert a change in bddce2c now that rock-3a building succeeds and provides a usable image (#3271)
@lanefu lanefu merged commit 32dc244 into armbian:master Dec 31, 2021
@NexusXe NexusXe deleted the patch-1 branch December 31, 2021 11:37
@NexusXe
Copy link
Collaborator Author

NexusXe commented Dec 31, 2021

revert commit was accidental, sorry

@lanefu
Copy link
Member

lanefu commented Dec 31, 2021

Wait you want me to revert your revert?

@EvilOlaf
Copy link
Member

Revert the revert of the revert? That is kind a inception thing... 🤯

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
@NexusXe
Re-enable rock-3a building now that it works (armbian#3373)
5565ac3 
Revert a change in bddce2c now that rock-3a building succeeds and provides a usable image (armbian#3271)
useful64 pushed a commit to useful64/build that referenced this pull request Feb 4, 2022
@NexusXe
Re-enable rock-3a building now that it works (armbian#3373)
68a4af5 
Revert a change in bddce2c now that rock-3a building succeeds and provides a usable image (armbian#3271)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lanefu lanefu lanefu approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@NexusXe @lanefu @EvilOlaf