Skip to content
Snippets Groups Projects

temp/dhcpcd: disabled IFA_F_NOPREFIXROUTE

Merged Imported Administrator requested to merge fix/dhcpcd-old-kernels into master
All threads resolved!

Fixes #50 (closed)

Merge request reports

Approved by

Merged by AdministratorAdministrator 6 years ago (Feb 28, 2019 12:50pm UTC)

Merge details

Pipeline #196646 passed

Pipeline passed for 67ceee40 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Administrator
  • Administrator
  • Author Owner

    Found some minor things in the code review, can you fix these?

    Thank you very much for making this patch @JuniorJPDJ! :tada:

    By Oliver Smith on 2019-02-19T08:54:15

  • Author Owner

    Of course, thanks for tips.

    By JuniorJPDJ on 2019-02-19T11:21:34

  • Administrator added 1 commit · Imported

    added 1 commit

    • 527008b7 - temp/dhcpcd: removed alpine's maintainers, bumped pkgver

    Compare with previous version

    By JuniorJPDJ on 2019-02-19T11:32:08

  • Author Owner

    @ollieparanoid Gonna merge it?

    By JuniorJPDJ on 2019-02-23T05:28:56

  • Administrator added 26 commits · Imported

    added 26 commits

    • 527008b7...7597fa7a - 24 commits from branch postmarketOS:master
    • 34fd2705 - temp/dhcpcd: disabled IFA_F_NOPREFIXROUTE
    • 85ce0f30 - temp/dhcpcd: removed alpine's maintainers, bumped pkgver

    Compare with previous version

    By JuniorJPDJ on 2019-02-23T05:29:12

  • Administrator resolved all discussions · Imported

    resolved all discussions

    By JuniorJPDJ on 2019-02-23T05:30:13

  • Author Owner

    Sorry, I was pretty busy over the past week with non-pmOS related stuff.

    I would like to merge this, but this setting is disabled in the merge request:

    Allow commits from members who can merge to the target branch.

    Can you enable it and post a comment here afterwards?

    How should I make sure to follow alpine versions? So I can update _pkgver then?

    We have a test case, which compares postmarketOS aports versions against the ones from Alpine. Can you add a test there?

    https://gitlab.postmarketos.org/postmarketos/pmaports/blob/master/.gitlab-ci/testcases/test_upstream_compatibility.py

    Thanks for all the effort you have put into this @JuniorJPDJ. Let's get this great fix merged ASAP :smiley:

    By Oliver Smith on 2019-02-27T18:27:58

  • Administrator added 19 commits · Imported

    added 19 commits

    • 85ce0f30...11d71723 - 17 commits from branch postmarketOS:master
    • a35fe59e - temp/dhcpcd: disabled IFA_F_NOPREFIXROUTE
    • 3f903901 - temp/dhcpcd: removed alpine's maintainers, bumped pkgver

    Compare with previous version

    By JuniorJPDJ on 2019-02-27T22:45:45

  • Author Owner

    I would like to merge this, but this setting is disabled in the merge request:

    Enabled and rebased.

    We have a test case, which compares postmarketOS aports versions against the ones from Alpine. Can you add a test there?

    I'm not familiar with any testing, what should I do to add it?

    By JuniorJPDJ on 2019-02-27T22:48:01

    Edited by Administrator
  • Administrator added 7 commits · Imported

    added 7 commits

    Compare with previous version

    By Oliver Smith on 2019-02-28T12:48:37

  • Administrator approved this merge request · Imported

    approved this merge request

    By Oliver Smith on 2019-02-28T12:49:50

  • Administrator merged · Imported

    merged

    By Oliver Smith on 2019-02-28T12:50:48

  • Author Owner

    I'm not familiar with any testing, what should I do to add it?

    A new function at the end of the file, something like this (untested):

    @pytest.mark.pmaports_upstream_compat
    def test_temp_forks(args):
        """
        (add a description of the test here)
        """
        pkgnames = ["dhcpcd"]
        failed = []
    
        for pkgname in pkgnames:
            # Pkgver from pmaports
            apkbuild = pmb.helpers.pmaports.get(args, pkgname)
            pkgver_pmaports = apkbuild["_pkgver"]
    
            # Pkgver from upstream
            index_data = pmb.parse.apkindex.package(args, pkgname)
            version_upstream = index_data["version"]
            pkgver_upstream = version_upstream.split("-r")[0]
    
            # Compare
            if pkgver_pmaports != pkgver_upstream:
                failed.append(pkgname + ": " + pkgver_pmaports + " != " +
                              pkgver_upstream)
    
        assert [] == failed

    You can run the tests from that file with this command:

    pytest-3 .gitlab-ci/testcases/test_upstream_compatibility.py -vv

    @JuniorJPDJ: It would be great if you could fix it up until it works as expected, and make another merge request :thumbsup:

    By Oliver Smith on 2019-02-28T13:10:21

  • Administrator mentioned in commit 67ceee40 · Imported

    mentioned in commit 67ceee40

    By JuniorJPDJ on 2019-03-08T15:59:09

  • Administrator mentioned in issue #148 (closed) · Imported

    mentioned in issue #148 (closed)

    By Oliver Smith on 2019-03-11T08:42:23

  • Please register or sign in to reply
    Loading