Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
  • Sign in / Register
I
image-builder
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 21
    • Issues 21
    • List
    • Boards
    • Labels
    • Milestones
  • Merge Requests 8
    • Merge Requests 8
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Analytics
    • Analytics
    • CI / CD
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Librem5
  • image-builder
  • Merge Requests
  • !86

Merged
Opened Mar 06, 2019 by Angus Ainslie@angus.ainslie
  • Report abuse
Report abuse

Drop builders

  • Overview 6
  • Commits 4
  • Pipelines 1
  • Changes 8

The u-boot and kernel builds have been separated from the image build

https://source.puri.sm/Librem5/kernel-builder

https://source.puri.sm/Librem5/u-boot-builder

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://source.puri.sm/angus.ainslie/image-builder.git" "drop_builders"
git checkout -b "angus.ainslie/image-builder-drop_builders" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/master"
git merge --no-ff "angus.ainslie/image-builder-drop_builders"

Step 4. Push the result of the merge to GitLab

git push origin "master"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
devkit
Assign labels
  • View project labels
Reference: Librem5/image-builder!86

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.