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

Unify NFS configuration #3376

Merged
merged 3 commits into from
Jan 4, 2022
Merged

Unify NFS configuration #3376

merged 3 commits into from
Jan 4, 2022

Conversation

patrickbkr
Copy link
Contributor

Description

I unified the NFS config of all configuration files. I did so by doing the setup via autoconf in a separate kernel tree, and manually inserting the changes into one configuration. Then I "blindly" copied the respective fragments from that one configuration file over to the others. Only the mvebu64 (on an espressobin) configuration was tested as that's the only board a friend of mine has access to.

How Has This Been Tested?

Said friend has build a kernel using this configuration and is using it on his testing board. NFSv4 is setup and working.

Checklist:

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

igorpecovnik
igorpecovnik requested changes Jan 3, 2022
View reviewed changes
Copy link
Member

@igorpecovnik igorpecovnik left a comment

Choose a reason for hiding this comment

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

config/kernel/linux-rk35xx-legacy.config has many unrelated changes?

@igorpecovnik igorpecovnik self-requested a review January 4, 2022 15:14
@igorpecovnik igorpecovnik merged commit 7698848 into armbian:master Jan 4, 2022
@patrickbkr
Copy link
Contributor Author

@igorpecovnik I'm sorry for messing up (and you now cleaning up after me!) This was the result of me messing up a rebase and accidentally reverting a intermediate commit. Thank you for already having done the fix!

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
@patrickbkr @igorpecovnik
Unify NFS configuration (armbian#3376)
02b7b53 
* Unify NFS configuration
* Fix rk35xx kernel

Co-authored-by: Igor Pecovnik <igor.pecovnik@gmail.com>
useful64 pushed a commit to useful64/build that referenced this pull request Feb 4, 2022
@patrickbkr @igorpecovnik
Unify NFS configuration (armbian#3376)
c113e67 
* Unify NFS configuration
* Fix rk35xx kernel

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

@igorpecovnik igorpecovnik igorpecovnik 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
2 participants
@patrickbkr @igorpecovnik