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.

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

fix: Set correct systemd installation dir. #2113

Merged
1 commit merged into from
May 14, 2024

Conversation

ghost
Copy link

@ghost ghost commented May 8, 2024

This is important when usrmerge is enabled, which changes the systemd install location.

Changelog: Commit
Ticket: None

This is important when usrmerge is enabled, which changes the systemd
install location.

Changelog: Commit
Ticket: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
@mender-test-bot
Copy link

Merging these commits will result in the following changelog entries:

Changelogs

meta-mender (systemd_location)

New changes in meta-mender since master:

Bug Fixes
  • Set correct systemd installation dir.

    This is important when usrmerge is enabled, which changes the systemd
    install location.

@mender-test-bot
Copy link

@kacf, Let me know if you want to start the integration pipeline by mentioning me and the command "start pipeline".


my commands and options

You can trigger a pipeline on multiple prs with:

  • mentioning me and start pipeline --pr mender/127 --pr mender-connect/255

You can start a fast pipeline, disabling full integration tests with:

  • mentioning me and start pipeline --fast

You can trigger GitHub->GitLab branch sync with:

  • mentioning me and sync

You can cherry pick to a given branch or branches with:

  • mentioning me and:
 cherry-pick to:
 * 1.0.x
 * 2.0.x

@ghost
Copy link
Author

ghost commented May 8, 2024

@PreetiSachan: Hey, could you try this as an alternative to your original pull request? It won't (currently) work for already released Mender versions, but let's solve it for the upcoming versions first. You can set it to the git version by adding this to your local.conf:

PREFERRED_VERSION_mender =        "master-git%"
PREFERRED_VERSION_mender-native = "master-git%"

If it works for you, then we can get it merged and think about a patch for the existing recipes.

ColinFinck added a commit to enlyze/meta-mender that referenced this pull request May 8, 2024
@PreetiSachan
Copy link
Contributor

PreetiSachan commented May 10, 2024

@kacf
Verified scarthgap & kikrstone builds by setting below in local.conf using meta-mender, master branch. It's working fine. PR can be merged.
PREFERRED_VERSION_mender = "master-git%"
PREFERRED_VERSION_mender-native = "master-git%"

Something wrong with meta-mender,kirkstone branch. Recipe mender_git (master-gitAUTOINC+b1ece970c2-r0) failed with below do_configure error:

-- Detecting CXX compile features - done
CMake Error at src/common/CMakeLists.txt:39 (add_subdirectory):
The source directory

/yocto-kirkstone/build/tmp-glibc/work/corei7-64-oe-linux/mender/master-gitAUTOINC+b1ece970c2-r0/git/src/common/vendor/tiny-process-library
does not contain a CMakeLists.txt file.
ERROR: Task (/yocto-kirkstone-build/intel-embedded-system-enabling/meta-mender/meta-mender-core/recipes-mender/mender-client/mender_git.bb:do_configure) failed with exit code '1'

@ghost ghost merged commit 058cb4f into mendersoftware:master May 14, 2024
18 checks passed
@ghost ghost deleted the systemd_location branch May 14, 2024 10:47
@mender-test-bot
Copy link

Hello 😺 This PR contains changelog entries. Please, verify the need of backporting it to the following release branches:
kirkstone (release 3.7.x) - 🤖 🍒
dunfell (release 3.6.x)

@ghost
Copy link
Author

ghost commented May 15, 2024

@PreetiSachan: Thanks for testing!

The kirkstone error is new to me. This patch has not been merged to the kirkstone branch yet (on its way here), but even so, the error you reported is not the error I'd expect to see.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants