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

[hardknott] curlpp, ldns: fix override syntax #419

Closed
wants to merge 2 commits into from

Conversation

rohieb
Copy link
Contributor

@rohieb rohieb commented Aug 25, 2021

Commits bca3bbb and 2e794f3 cherry-picked a fix from master, which used the new override syntax, which was introduced in poky commit 2abf8a699edd513405be. However, this change was merged after 3.4_M2 and is not part of hardknott, so bitbake complains about the new syntax:

ERROR: ParseError at …/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb:20: unparsed line: 'do_install:append() {'
ERROR: ParseError at …/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb:20: unparsed line: 'do_install:append() {' 

Revert to the old override syntax on the hardknott branch for now.

rohieb added 2 commits August 25, 2021 10:15
Commit bca3bbb cherry-picked a fix from master, which used
the new override syntax, which was introduced in poky commit
2abf8a699edd513405be (2021-07-25, "bitbake: bitbake: Switch to using new
override syntax"). However, this change was merged after 3.4_M2 and is
not part of hardknott, so bitbake complains about the new syntax:

    ERROR: ParseError at
    …/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb:20:
    unparsed line: 'do_install:append() {'

Revert to the old syntax on the hardknott branch for now.

Fixes: bca3bbb (2021-08-09, "curlpp: fix QA Issue after LDFLAGS change")
Signed-off-by: Roland Hieber <[email protected]>
Commit 2e794f3 cherry-picked a fix from master, which used
the new override syntax, which was introduced in poky commit
2abf8a699edd513405be (2021-07-25, "bitbake: bitbake: Switch to using new
override syntax"). However, this change was merged after 3.4_M2 and is
not part of hardknott, so bitbake complains about the new syntax:

    ERROR: ParseError at
    …/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.7.1.bb:20:
    unparsed line: 'do_install:append() {'

Revert to the old syntax on the hardknott branch for now.

Fixes: 2e794f3 (2021-08-09, "ldns: fix QA Issue after LDFLAGS change")
Signed-off-by: Roland Hieber <[email protected]>
@rohieb
Copy link
Contributor Author

rohieb commented Aug 25, 2021

I'd rather fix a syntax error than cherry-pick a new bitbake feature…

@akuster akuster self-assigned this Aug 25, 2021
@akuster
Copy link
Contributor

akuster commented Aug 25, 2021

that is weird. I do recall make those kinds of fixups on some backports. Guess I missed some or pushed the wrong changes. thanks for patches.

@akuster
Copy link
Contributor

akuster commented Aug 25, 2021

@akuster
Copy link
Contributor

akuster commented Aug 28, 2021

pending merge to hardknott

@akuster
Copy link
Contributor

akuster commented Aug 28, 2021

@akuster akuster closed this Aug 28, 2021
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 14, 2022
Changelog:
=========
- Release tarball might be in --format=pax.
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix *expandargv*openembedded#419=restrict (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- deal with argc==0 aka CVE-2021-4034.

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 14, 2022
Changelog:
=========
- Release tarball might be in --format=pax.
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix *expandargv*openembedded#419=restrict (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- deal with argc==0 aka CVE-2021-4034.

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 15, 2022
Changelog:
=========
- Release tarball might be in --format=pax.
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix *expandargv*openembedded#419=restrict (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- deal with argc==0 aka CVE-2021-4034.

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
rtollert pushed a commit to rtollert/meta-openembedded that referenced this pull request Aug 4, 2022
Changelog:
=========
- Release tarball might be in --format=pax.
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix *expandargv*openembedded#419=restrict (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- deal with argc==0 aka CVE-2021-4034.

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
rtollert pushed a commit to rtollert/meta-openembedded that referenced this pull request Aug 9, 2022
Changelog:
=========
- Release tarball might be in --format=pax.
- Again honour MTA arguments passed after the "--" command line
  "option" in non-send-only mode (broken since at least v14.9.12).
- support Microsoft IMAP servers.
- Fix crash due to crafted emails.
- Fix *expandargv*openembedded#419=restrict (broken since v14.9.0).
- Fix a bug from nail 10.08 as of 2004-06-28 that leads to
  crashes when some file cannot be loaded.
  And while here fix one file-close overshoot of mine in since
  v14.9.16, that would cause panics in debug-enabled code.
- deal with argc==0 aka CVE-2021-4034.

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 3, 2023
Changelog:
=========
 Call _default as fallback in zsh global completion hook
 Begin support for mapping-emitting completers
 activate-global-python-argcomplete: do not overwrite existing dotfile in user directory
 Add NOTICE file
 Establish long term name for split_line as argcomplete.lexers.split_line
 Re-add split_line to API (openembedded#419)
 Fix zsh default completion issues
 Fix zsh autoload issues

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 3, 2023
Changelog:
=========
 Call _default as fallback in zsh global completion hook
 Begin support for mapping-emitting completers
 activate-global-python-argcomplete: do not overwrite existing dotfile in user directory
 Add NOTICE file
 Establish long term name for split_line as argcomplete.lexers.split_line
 Re-add split_line to API (openembedded#419)
 Fix zsh default completion issues
 Fix zsh autoload issues

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 3, 2023
Changelog:
=========
 Call _default as fallback in zsh global completion hook
 Begin support for mapping-emitting completers
 activate-global-python-argcomplete: do not overwrite existing dotfile in user directory
 Add NOTICE file
 Establish long term name for split_line as argcomplete.lexers.split_line
 Re-add split_line to API (openembedded#419)
 Fix zsh default completion issues
 Fix zsh autoload issues

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 4, 2023
Changelog:
=========
 Call _default as fallback in zsh global completion hook
 Begin support for mapping-emitting completers
 activate-global-python-argcomplete: do not overwrite existing dotfile in user directory
 Add NOTICE file
 Establish long term name for split_line as argcomplete.lexers.split_line
 Re-add split_line to API (openembedded#419)
 Fix zsh default completion issues
 Fix zsh autoload issues

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Apr 5, 2023
Changelog:
=========
 Call _default as fallback in zsh global completion hook
 Begin support for mapping-emitting completers
 activate-global-python-argcomplete: do not overwrite existing dotfile in user directory
 Add NOTICE file
 Establish long term name for split_line as argcomplete.lexers.split_line
 Re-add split_line to API (openembedded#419)
 Fix zsh default completion issues
 Fix zsh autoload issues

Signed-off-by: Wang Mingyu <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
@rohieb rohieb deleted the hardknott branch April 11, 2023 10:11
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