meta: 3 minor fixes
cover meta: 3 minor fixes
The following changes since commit 3b5ac72bdf76ac8ff98dc3c882a4edc77c6e2c33:
rpm: add a "rpm-build" PROVIDES (2017-03-22 15:09:26 +0000)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/3fixes
Robert Yang (3):
runtime-test.py: fix typo
scripts/wic: fix typo
apt: fix hardcode of /usr/lib
meta/lib/oeqa/selftest/runtime-test.py | 4 ++-- meta/recipes-devtools/apt/apt-package.inc | 2 +- scripts/wic | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.9.0
PATCH 1/3 runtime-test.py: fix typo
roofs -> rootfs.
--- meta/lib/oeqa/selftest/runtime-test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/lib/oeqa/selftest/runtime-test.py +2 -2
@@ -181,10 +181,10 @@ postinst-delayed-t \ break @testcase(1545) - def test_postinst_roofs_and_boot(self): + def test_postinst_rootfs_and_boot(self): """ Summary: The purpose of this test case is to verify Post-installation - scripts are called when roofs is created and also test + scripts are called when rootfs is created and also test that script can be delayed to run at first boot. Dependencies: NA Steps: 1. Add proper configuration to local.conf file
Signature · 1 line
2.9.0
PATCH 2/3 scripts/wic: fix typo
In reply to Robert Yangroofs -> rootfs
--- scripts/wic | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/wic +2 -2
@@ -146,7 +146,7 @@ def wic_create_subcommand(args, usage_str): raise WicError("Wrong number of arguments, exiting") if options.build_rootfs and not bitbake_main: - raise WicError("Can't build roofs as bitbake is not in the $PATH") + raise WicError("Can't build rootfs as bitbake is not in the $PATH") if not options.image_name: missed = []
@@ -223,7 +223,7 @@ def wic_create_subcommand(args, usage_str): kernel_dir = options.kernel_dir native_sysroot = options.native_sysroot if rootfs_dir and not os.path.isdir(rootfs_dir): - raise WicError("--roofs-dir (-r) not found, exiting") + raise WicError("--rootfs-dir (-r) not found, exiting") if not os.path.isdir(bootimg_dir): raise WicError("--bootimg-dir (-b) not found, exiting") if not os.path.isdir(kernel_dir):
Signature · 1 line
2.9.0
PATCH 3/3 apt: fix hardcode of /usr/lib
In reply to Robert YangIt should be ${libdir} rather than /usr/lib, otherwise it would fail when multilib.
--- meta/recipes-devtools/apt/apt-package.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/apt/apt-package.inc +1 -1
@@ -83,7 +83,7 @@ do_install () { install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/ + install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/ install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/ install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ install -d ${D}${sysconfdir}/cron.daily/
Signature · 1 line
2.9.0
Re: [PATCH 3/3] apt: fix hardcode of /usr/lib
meta/recipes-devtools/apt/apt-package.inc do_install () { · line 86
Quoted 3 lines · Robert Yang
meta/recipes-devtools/apt/apt-package.inc +1
-1- install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/ + install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/
$ grep -r apt.systemd.daily debian/apt-daily.service:ExecStart=/usr/lib/apt/apt.systemd.daily debian/apt.apt-compat.cron.daily:exec /usr/lib/apt/apt.systemd.daily
If you're going to move apt.systemd.daily, then you need to fix the references to it aswell.
Ross
Re: [PATCH 3/3] apt: fix hardcode of /usr/lib
Quoted 8 lines · Ross
On 24 March 2017 at 08:55, Robert Yang <[email protected] <mailto:[email protected]>> wrote:
- install -m 0644 ${S}/debian/apt.systemd.daily ${D}/usr/lib/apt/
+ install -m 0644 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/
Quoted 6 lines
$ grep -r apt.systemd.daily debian/apt-daily.service:ExecStart=/usr/lib/apt/apt.systemd.daily debian/apt.apt-compat.cron.daily:exec /usr/lib/apt/apt.systemd.dailyIf you're going to move apt.systemd.daily, then you need to fix the references to it aswell.
Thanks, I will send apt's fix in another path since the other 2 patches are in master-next.
// Robert
Quoted 2 lines
Ross