Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
B
busybox
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • busybox
  • Merge Requests
  • !3

Merged
Opened Nov 29, 2018 by Tomi Leppänen@tomin
  • Report abuse
Report abuse

Enable and package grep, find, xargs, diff, cmp

  • Overview 0
  • Commits 4
  • Changes 185+

Upgrades Busybox to 1.29.3 and enables a few more tools.

[packaging] Package diffutils symlinks. JB#36423 [packaging] Package findutils symlinks. JB#36243 [packaging] Package grep symlinks. JB#40843 [config] Enable cmp and diff. JB#36423 [config] Enable find and xargs. JB#36243 [config] Enable grep, fgrep, egrep. JB#40843

Check out, review, and merge locally

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

git fetch "https://git.sailfishos.org/tomin/busybox.git" "jb36423_jb36243_jb40843_b"
git checkout -b "tomin/busybox-jb36423_jb36243_jb40843_b" 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 "tomin/busybox-jb36423_jb36243_jb40843_b"

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
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/busybox!3

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.