Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
abuild
abuild
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 25
    • Issues 25
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 16
    • Merge Requests 16
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
  • Operations
    • Operations
    • Environments
  • 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
  • alpine
  • abuildabuild
  • Merge Requests
  • !46

Open
Opened May 28, 2020 by Ariadne Conill@kaniiniContributor
  • Report abuse
Report abuse

Check out, review, and merge locally

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

git fetch "https://gitlab.alpinelinux.org/kaniini/abuild.git" "cendian"
git checkout -b "kaniini/abuild-cendian" 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 "master"
git merge --no-ff "kaniini/abuild-cendian"

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.

functions: query apk-tools for host endianness as $CENDIAN.

  • Overview 0
  • Commits 1
  • Changes 1

This allows for APKBUILDs to know the target endianness in the same way as it knows the target $CARCH. In cross-compile situation, specifying $CENDIAN via environment or abuild.conf is necessary.

This will be expanded on in the form of $arch hints, arch="all !big-endian" for example to block the package on big-endian systems.

Something similar is in the works for 32-bit vs 64-bit.

To make use of this feature, apk-tools 2.11 or later must be present. See apk-tools!29 for more details.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: alpine/abuild!46
Source branch: cendian