Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
S
slapos.recipe.cmmi
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 2
    • Merge Requests 2
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • nexedi
  • slapos.recipe.cmmi
  • Merge Requests
  • !1

Open
Opened Oct 09, 2016 by Julien Muchembled@jm
  • Report abuse
Report abuse

WIP: make the distinction between 'make' and 'make install' actually useful

We kept this stupid code from hexagonit.recipe.cmmi:

                self.run('%s %s' % (make_cmd, make_options))
                self.run('%s %s %s' % (make_cmd, make_options, make_targets))

And I'd like to stop using the following hack:

make-binary =
make-options =
make-targets = make -j1 foo install
  option1
  option2

when I want to build something else that the first target.

This minimal patch solves the above case:

_options =
  option1
  option2
make-options = foo ${:_options}
make-install-options = install ${:_options}

But not "different make-binary", and maybe we also want something more convenient. For example 6 options:

  • build-binary, build-options, build-targets
  • install-binary (defaults to build-binary), install-options (defaults to build-options), install-targets

/cc @vpelletier @kazuhiko @rafael

Check out, review, and merge locally

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

git fetch origin
git checkout -b make-targets origin/make-targets

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 make-targets

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.

  • Discussion 1
  • Commits 1
  • Changes 2
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/slapos.recipe.cmmi!1
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7