-
Notifications
You must be signed in to change notification settings - Fork 710
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
ufw: fix python shebang #344
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs to be added to SRC_URI
as well :)
I'm a rookie so I made a rookie mistake :) . Fixed now. |
Also, will this be backported or should I make a new PR for dunfell? |
once merged into master, backport that into dunfell and create a new pull |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
squash it into single commit.
Done. Sorry for the mistakes. First time contributing to a big project :) |
Fails to build see https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1170 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this does not compile as reported
Working on the fix atm. I'll push the changes in a bit |
[meta-openembedded ticket openembedded#327] -- openembedded#327 The python version in the shebang at the begining of the ufw script should be the same one as the version the setup.py script was called with. The fix in patch "setup-only-make-one-reference-to-env.patch" depends on sys.executable returning "/usr/bin/env pythonX". However, it returns "/usr/bin/pythonX". Using sys.version_info we can get the major version of the python used to called the script and append that to the shebang line so it works as intended. Signed-off-by: Silcet <camorga1@gmail.com>
@kraj I've been working more with UFW these days and although it builds fine and has the proper python3 shebang to work now it has many other flaws. The setup.py modifies source files in a way that is incompatible with how distutils is used in openembedded (I can elaborate if you are interested). I'm testing with a bumped version to 0.36 which seems to work much better. Would it make sense to just drop this PR and make another one with a working 0.36 instead? |
that would be fine too. I have dropped this patch from |
applied with 5194af1 |
Version 2.11 ============ Released 2018-02-09 * New features: - Add `json_pack()` format specifiers s*, o* and O* for values that can be omitted if null (openembedded#339). - Add `json_error_code()` to retrieve numeric error codes (openembedded#365, openembedded#380, openembedded#381). - Enable thread safety for `json_dump()` on all systems. Enable thread safe `json_decref()` and `json_incref()` for modern compilers (openembedded#389). - Add `json_sprintf()` and `json_vsprintf()` (openembedded#393). * Bug Fixes: - Fix incorrect report of success from `json_dump_file()` when an error is returned by `fclose()` (openembedded#359). - Make json_equal() const-correct (openembedded#344). - Fix incomplete stealing of references by `json_pack()` (openembedded#374). * Build: - Work around gcc's -Wimplicit-fallthrough. - Fix CMake detection of `sys/types.h` header (openembedded#375). - Fix `jansson.pc` generated by CMake to be more consistent with the one generated using GNU Autotools (openembedded#368). * Other: - Miscellaneous documentation fixes (openembedded#356, openembedded#378, openembedded#395). - Remove unnecessary reference actions from parsers (openembedded#377). Version 2.10 ============ Released 2017-03-02 * New features: - Add JSON_EMBED encoding flag allowing arrays and objects to be encoded into existing streams (openembedded#329). - Add `json_dumpb()` function for dumping to a pre-allocated buffer (openembedded#328). - Add `json_dumpfd()` and `json_loadfd()` functions for dumping to streaming file descriptors (openembedded#328). - Add support for parsing buffers larger than 2GB (openembedded#309). * Build: - Fix CMake build when LONG_LONG_INT is defined as "" (openembedded#321) * Other: - Internal code cleanup (openembedded#311, openembedded#314) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Version 2.11 ============ Released 2018-02-09 * New features: - Add `json_pack()` format specifiers s*, o* and O* for values that can be omitted if null (openembedded#339). - Add `json_error_code()` to retrieve numeric error codes (openembedded#365, openembedded#380, openembedded#381). - Enable thread safety for `json_dump()` on all systems. Enable thread safe `json_decref()` and `json_incref()` for modern compilers (openembedded#389). - Add `json_sprintf()` and `json_vsprintf()` (openembedded#393). * Bug Fixes: - Fix incorrect report of success from `json_dump_file()` when an error is returned by `fclose()` (openembedded#359). - Make json_equal() const-correct (openembedded#344). - Fix incomplete stealing of references by `json_pack()` (openembedded#374). * Build: - Work around gcc's -Wimplicit-fallthrough. - Fix CMake detection of `sys/types.h` header (openembedded#375). - Fix `jansson.pc` generated by CMake to be more consistent with the one generated using GNU Autotools (openembedded#368). * Other: - Miscellaneous documentation fixes (openembedded#356, openembedded#378, openembedded#395). - Remove unnecessary reference actions from parsers (openembedded#377). Version 2.10 ============ Released 2017-03-02 * New features: - Add JSON_EMBED encoding flag allowing arrays and objects to be encoded into existing streams (openembedded#329). - Add `json_dumpb()` function for dumping to a pre-allocated buffer (openembedded#328). - Add `json_dumpfd()` and `json_loadfd()` functions for dumping to streaming file descriptors (openembedded#328). - Add support for parsing buffers larger than 2GB (openembedded#309). * Build: - Fix CMake build when LONG_LONG_INT is defined as "" (openembedded#321) * Other: - Internal code cleanup (openembedded#311, openembedded#314) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Changelog: =========== - Fixes openembedded#409: IndexError on empty strong mark. - Fix openembedded#332: Insert at most one space for multiple emphasis - Feature openembedded#318: Make padded tables more similar to pandoc's pipe_tables. - Add support for Python 3.9. - Fix extra line breaks inside html link text (between '[' and ']') - Fix openembedded#344: indent <ul> inside <ol> three spaces instead of two to comply with CommonMark, GFM, etc. - Fix openembedded#324: unnecessary spaces around <b>, <em>, and strike tags. - Don't wrap tables by default and add a --wrap-tables config option. - Feature openembedded#198: Ignore <p> tags inside table rows. - Don't wrap tables by default and add a --wrap-tables config option - Remove support for Python <= 3.5. Now requires Python 3.6+. - Support for Python 3.10+. - Fix openembedded#320 padding empty tables and tables with no </tr> tags. - Add ignore_mailto_links config option to ignore mailto: style links. - Feature openembedded#407: Support the superscript and subscript tags. - Fix openembedded#373: \n inside text of a Markdown link. - Feature openembedded#406: Improve support for null atttibute values. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
[meta-openembedded ticket #327] --
#327
The python version in the shebang at the begining of the ufw script
should be the same one as the version the setup.py script was called
with.
The fix in patch "setup-only-make-one-reference-to-env.patch"
depends on sys.executable returning "/usr/bin/env pythonX". However,
it returns "/usr/bin/pythonX". Using sys.version_info we can get the
major version of the python used to called the script and append
that to the shebang line so it works as intended.
Signed-off-by: Silcet camorga1@gmail.com