Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a package for Bird 2.0 #378

Merged
merged 2 commits into from
May 17, 2018
Merged

Add a package for Bird 2.0 #378

merged 2 commits into from
May 17, 2018

Conversation

tohojo
Copy link
Contributor

@tohojo tohojo commented May 16, 2018

This adds a new package for bird 2.0, renaming the old Bird packages to allow them to co-exist (as bird1 and bird2 + suffixes).

This is based on, and supercedes, #340

@Noltari: I added myself as maintainer for bird2 as I wasn't sure whether you'd want to maintain both packages.

Cc @eloicaso @p4u

This renames the bird and bird-openwrt packages to bird1, to make it
possible for bird2 (added in a subsequent commit) to coexist with it.

The packages are renamed to bird1-ipv{4,6} to avoid the confusion of
having packages named 'bird2', 'bird4' and 'bird6'.

Also bump to v1.6.4 as that contains important bug fixes.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
This adds a separate package for the 2.0 branch of Bird, allowing it to
co-exist with the bird1 package. The two packages conflict with each other,
so they can't be installed at the same time; but in the build system they
coexist just fine.

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
@tohojo tohojo mentioned this pull request May 16, 2018
@mwarning
Copy link
Contributor

mwarning commented May 16, 2018

If package bird is renamed to bird1, it will not be connected to any installed bird package.
Maybe it might be better to keep the name for package bird 1.x.

Anyway, thanks for your effort to update the package!

@tohojo
Copy link
Contributor Author

tohojo commented May 16, 2018

Yeah, I realise that; but I want to avoid the bird2/4/6 confusion. I did add CONFLICTS to all the new packages, so installing the new ones should get rid of the old ones.

I guess I could add stub packages for the old names that pull in the new ones instead? Not sure that works with opkg, though?

Also, this would only affect people who run 'opkg update' on master builds; how common is that, and how many hoops do we want to jump through to accommodate it? :)

@mwarning
Copy link
Contributor

Ah, I did not notice the CONFLICTS line. :-)
If the bird package is not upgradeable, then bird1 for the updated package should be fine.

@eloicaso
Copy link
Contributor

I'm happy with the changes proposed to the bird-openwrt itself. It will make it easy to maintain and the conflict in bird2 will avoid adding odd restrictions in the bird-openwrt package (I started playing with the few flags available to prevent a package to go beyond version X.Y.Z and it wasn't working at all). I'm hoping to start implementing the bird2-openwrt package on june~july, so I'll keep an eye on any updates on bird2 :)

Cheers!

@mwarning
Copy link
Contributor

It builds for me. Let me know when it is ready to be merged.

@tohojo
Copy link
Contributor Author

tohojo commented May 17, 2018 via email

@mwarning mwarning merged commit 23c0402 into openwrt:master May 17, 2018
@mwarning mwarning mentioned this pull request May 17, 2018
@tohojo
Copy link
Contributor Author

tohojo commented May 17, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants