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

[master][dunfell] openct: cleanup and allow building as native package #299

Closed
wants to merge 3 commits into from

Conversation

rohieb
Copy link
Contributor

@rohieb rohieb commented Dec 13, 2020

  • Allow building openct as native package
  • Clean up do_install:
    • Use sysconfdir and nonarch_libdir instead of hard-coded paths, and be
      consistent with the slashes after ${D}
    • Install udev rules into /usr/lib/udev instead of /etc/udev so they can
      be overwritten in /etc, which has higher priority. Also use /usr/lib
      instead of /lib, latter of which isn't searched by udev (see
      [manpage][1]).
    • Don't create /usr/lib/udev, it is already created by install -D later
      with the default umask, which is fine.
    • Make use of do_install[cleandirs].
  • Remove lines that first created /var/run/openct and then removed it again

This is for master, but applies to dunfell as well.

Also remove /run/openct/status from FILES_${PN}, which isn't being
created at all by the recipe – even openct's configure script references
it as /var/run/openct/.

Fixes: 387824f (2016-02-28, "openct: Fix rootfs creation errors")
Fixes: 8e61ff9 (2019-11-21, "openct: merge do_install and do_install_append")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
* Use sysconfdir and nonarch_libdir instead of hard-coded paths, and be
  consistent with the slashes after ${D}
* Install udev rules into /usr/lib/udev instead of /etc/udev so they can
  be overwritten in /etc, which has higher priority. Also use /usr/lib
  instead of /lib, latter of which isn't searched by udev [1].
* Don't create /usr/lib/udev, it is already created by install -D later
  with the default umask, which is fine
* Make use of do_install[cleandirs]

[1]: https://www.freedesktop.org/software/systemd/man/udev.html

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
}

BBCLASSEXTEND="native"
Copy link
Contributor

Choose a reason for hiding this comment

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

usually, a space on both sides of = is norm.

@kraj
Copy link
Contributor

kraj commented Dec 16, 2020

the changes are in master now, I tweaked it myself to address the comment.

@kraj kraj closed this Dec 16, 2020
@rohieb
Copy link
Contributor Author

rohieb commented Dec 16, 2020

Thank you!

kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Feb 18, 2023
0001-Fix-build-with-libmicrohttpd.patch
removed since it's included in 1.4.1

Changelog:
===========
- Fedora CI build by updating to Catch v2.13.7
- Typo in README (openembedded#313)
- Deprecation warnings for Jsoncpp (openembedded#312)
- Compatibility with newer libmicrohttpd versions (>= 0.9.71) (openembedded#298 openembedded#299)
- Typo in diagram (openembedded#293)
- File descriptor leaks in connectors

- Vendoring catch library instead of downloading from github
- Moved from travis-ci to circleci (openembedded#311)
- Use '.empty()' checks instead of '.size() == 0'

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Feb 18, 2023
0001-Fix-build-with-libmicrohttpd.patch
removed since it's included in 1.4.1

Changelog:
===========
- Fedora CI build by updating to Catch v2.13.7
- Typo in README (openembedded#313)
- Deprecation warnings for Jsoncpp (openembedded#312)
- Compatibility with newer libmicrohttpd versions (>= 0.9.71) (openembedded#298 openembedded#299)
- Typo in diagram (openembedded#293)
- File descriptor leaks in connectors

- Vendoring catch library instead of downloading from github
- Moved from travis-ci to circleci (openembedded#311)
- Use '.empty()' checks instead of '.size() == 0'

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Feb 18, 2023
0001-Fix-build-with-libmicrohttpd.patch
removed since it's included in 1.4.1

Changelog:
===========
- Fedora CI build by updating to Catch v2.13.7
- Typo in README (openembedded#313)
- Deprecation warnings for Jsoncpp (openembedded#312)
- Compatibility with newer libmicrohttpd versions (>= 0.9.71) (openembedded#298 openembedded#299)
- Typo in diagram (openembedded#293)
- File descriptor leaks in connectors

- Vendoring catch library instead of downloading from github
- Moved from travis-ci to circleci (openembedded#311)
- Use '.empty()' checks instead of '.size() == 0'

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
@rohieb rohieb deleted the openct branch April 11, 2023 10:09
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Aug 19, 2024
- switch to meson build system

Changelog [1]:

$ git --no-pager log --oneline v1.0.4..v1.0.5
098d985 (tag: v1.0.5) Merge pull request openembedded#312 from cgwalters/release
0fae8a8 Release 1.0.5
9bdc377 Merge pull request openembedded#310 from cgwalters/symlink-limit
b06ea9b Verify payload length early on
3beb011 Merge pull request openembedded#308 from cgwalters/minor-rust-lints
a695ad4 Merge pull request openembedded#309 from giuseppe/libcomposefs-drop-ro
0a0d50f libcomposefs: drop using "ro" option
b35dc83 dumpfile: Fix clippy lint
a919ab8 rust: Drop unused cfg
3a87868 Merge pull request openembedded#307 from giuseppe/not-override-errno
bb94687 Merge pull request openembedded#306 from giuseppe/mkcomposefs-report-close-errors
76b4da5 mkcompose: report close() errors
502bc27 libcomposefs: do not override errno
2d2c09d Merge pull request openembedded#304 from jluebbe/meson
0260856 meson.build: Allow use as a meson subproject
5f512ac Merge pull request openembedded#303 from cgwalters/mount-source
91a3047 mount: Consistently use `composefs` as source
45e6179 Merge pull request openembedded#302 from cgwalters/info-term
f64022f info: Add missing terminator for `longopts`
d81cb87 Merge pull request openembedded#300 from jluebbe/meson
04c8a8e ci: Add GitHub Actions workflow which uses meson
64709f6 ci: Install meson package
b6f2b75 Add meson as an alternative to autotools
942cd73 Merge pull request openembedded#299 from giuseppe/composefs-info-set-locale
5072fd7 composefs-info: specify locale to isgraph/isprint
4f19d00 Merge pull request openembedded#298 from cgwalters/rust-misc
43a1d28 rust: Add README.md files, link to crates.io
a8bc747 rust: Clarify that "composefs-core" is really "composefs"
483356c Merge pull request openembedded#297 from cgwalters/rust-include
02213c0 composefs-core: Drop incorrect `include`
dce84ff Merge pull request openembedded#295 from cgwalters/rust-descr
3d2af03 Merge pull request openembedded#296 from Kiskae/upstream-tmpdir-fix
6928fcf test: remove hardcoded /tmp
e21be07 rust: Add mandatory `description` field, other misc changes
28dc491 Merge pull request openembedded#292 from cgwalters/rust-ci-dual
59c5a27 Merge pull request openembedded#293 from cgwalters/rust-minor
689ccc6 rust: Some doc and misc tweaks
426b65d ci: Test Rust code against current C code
32b3f6e Merge pull request openembedded#291 from Kiskae/patch-1
f7465b3 use correct `composefs-info` binary

[1] containers/composefs@v1.0.4...v1.0.5

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
kraj pushed a commit to YoeDistro/meta-openembedded that referenced this pull request Aug 19, 2024
- switch to meson build system

Changelog [1]:

$ git --no-pager log --oneline v1.0.4..v1.0.5
098d985 (tag: v1.0.5) Merge pull request openembedded#312 from cgwalters/release
0fae8a8 Release 1.0.5
9bdc377 Merge pull request openembedded#310 from cgwalters/symlink-limit
b06ea9b Verify payload length early on
3beb011 Merge pull request openembedded#308 from cgwalters/minor-rust-lints
a695ad4 Merge pull request openembedded#309 from giuseppe/libcomposefs-drop-ro
0a0d50f libcomposefs: drop using "ro" option
b35dc83 dumpfile: Fix clippy lint
a919ab8 rust: Drop unused cfg
3a87868 Merge pull request openembedded#307 from giuseppe/not-override-errno
bb94687 Merge pull request openembedded#306 from giuseppe/mkcomposefs-report-close-errors
76b4da5 mkcompose: report close() errors
502bc27 libcomposefs: do not override errno
2d2c09d Merge pull request openembedded#304 from jluebbe/meson
0260856 meson.build: Allow use as a meson subproject
5f512ac Merge pull request openembedded#303 from cgwalters/mount-source
91a3047 mount: Consistently use `composefs` as source
45e6179 Merge pull request openembedded#302 from cgwalters/info-term
f64022f info: Add missing terminator for `longopts`
d81cb87 Merge pull request openembedded#300 from jluebbe/meson
04c8a8e ci: Add GitHub Actions workflow which uses meson
64709f6 ci: Install meson package
b6f2b75 Add meson as an alternative to autotools
942cd73 Merge pull request openembedded#299 from giuseppe/composefs-info-set-locale
5072fd7 composefs-info: specify locale to isgraph/isprint
4f19d00 Merge pull request openembedded#298 from cgwalters/rust-misc
43a1d28 rust: Add README.md files, link to crates.io
a8bc747 rust: Clarify that "composefs-core" is really "composefs"
483356c Merge pull request openembedded#297 from cgwalters/rust-include
02213c0 composefs-core: Drop incorrect `include`
dce84ff Merge pull request openembedded#295 from cgwalters/rust-descr
3d2af03 Merge pull request openembedded#296 from Kiskae/upstream-tmpdir-fix
6928fcf test: remove hardcoded /tmp
e21be07 rust: Add mandatory `description` field, other misc changes
28dc491 Merge pull request openembedded#292 from cgwalters/rust-ci-dual
59c5a27 Merge pull request openembedded#293 from cgwalters/rust-minor
689ccc6 rust: Some doc and misc tweaks
426b65d ci: Test Rust code against current C code
32b3f6e Merge pull request openembedded#291 from Kiskae/patch-1
f7465b3 use correct `composefs-info` binary

[1] containers/composefs@v1.0.4...v1.0.5

Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
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.

2 participants