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

jool: added support for Jool SIIT/NAT64 #3604

Merged
merged 1 commit into from
Dec 14, 2016
Merged

jool: added support for Jool SIIT/NAT64 #3604

merged 1 commit into from
Dec 14, 2016

Conversation

danrl
Copy link
Contributor

@danrl danrl commented Dec 1, 2016

Maintainer: me
Compile tested: x86_64, LEDE (latest) commit
Run tested: x86_64, VDI image (VirtualBox), loading, unloading of kernel module, user space tools general usage

Description:

This adds support for the Jool SIIT/NAT64 translating kernel modules and user space
tools.

Signed-off-by: Dan Luedtke mail@danrl.com

Thanks to the Jool and LEDE mailing list members. They helped me to find and fix build errors and educated me by doing so 👍

@danrl
Copy link
Contributor Author

danrl commented Dec 1, 2016

Depends on NICMx/Jool#234

Copy link
Contributor

@diizzyy diizzyy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a few notes...


PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
PKG_BUILD_PARALLEL:=1
PKG_BUILD_DEPENDS:=USE_UCLIBC:argp-standalone USE_MUSL:argp-standalone
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be PKG_BUILD_DEPENDS:=argp-standalone ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line was authored by @jow- and finally made the Makefile work. Would like to consult him on this to better understand what is the best way.

PKG_SOURCE_VERSION:=c3463caf91781c1ebb40249f236f6ae028c88f74
##### ^ ^ ^ This is temporary. Waiting for upstream merge.
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use tar.xz instead tar.gz

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we are at it, I also changed the PKG_SOURCE. Upstream merged my other PR and we can now directly fetch the code from upstream. I'll push the changes when my build test is finished.

@jow-
Copy link
Contributor

jow- commented Dec 1, 2016

@diizzyy - the conditional build depends are intentional since there is no (need for) argp-standalone on glibc toolchains

@diizzyy
Copy link
Contributor

diizzyy commented Dec 1, 2016

@jow- I see, thanks for the clarification.

@danrl
Copy link
Contributor Author

danrl commented Dec 2, 2016

I guess we are all set then?

@diizzyy
Copy link
Contributor

diizzyy commented Dec 2, 2016

I guess so :-)

@danrl
Copy link
Contributor Author

danrl commented Dec 3, 2016

Bumped the version. Builds fine on my system.

@danrl
Copy link
Contributor Author

danrl commented Dec 8, 2016

May we merge soon? Would like to write corresponding luci packages and having this one merged helps the case I think.

@danrl
Copy link
Contributor Author

danrl commented Dec 14, 2016

Squashed the commits.

This adds support for the Jool SIIT/NAT64 translating kernel modules and user
space tools.

Signed-off-by: Dan Luedtke <mail@danrl.com>
@jow- jow- merged commit c2f7129 into openwrt:master Dec 14, 2016
@jow-
Copy link
Contributor

jow- commented Dec 14, 2016

Merged, thanks @danrl

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