diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2021-10-28 14:56:48 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-11-01 05:45:17 -0700 |
| commit | 8aac37b50236216fb4ac257028623ebb517787b9 (patch) | |
| tree | bf8feba0a8d11f09977c8877653539506cdadc63 /meta-networking | |
| parent | 7d7ae015feb17042f0963e5596138a4df03078b6 (diff) | |
| download | meta-openembedded-8aac37b50236216fb4ac257028623ebb517787b9.tar.gz | |
netplan: fix hardcoded path for /lib/netplan
The hardcoded path /lib/netplan causes a runtime error on multilib
image:
$ netplan try
An error occurred: [Errno 2] No such file or directory: '/lib/netplan/generate'
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-connectivity/netplan/netplan_0.103.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb b/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb index 3527bceeb2..1de739eeb6 100644 --- a/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb +++ b/meta-networking/recipes-connectivity/netplan/netplan_0.103.bb | |||
| @@ -40,6 +40,7 @@ do_install() { | |||
| 40 | install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands | 40 | install -m 644 ${S}/netplan/cli/commands/*.py ${D}${datadir}/netplan/netplan/cli/commands |
| 41 | install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ | 41 | install -m 755 ${S}/src/netplan.script ${D}${datadir}/netplan/ |
| 42 | ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan | 42 | ln -srf ${D}${datadir}/netplan/netplan.script ${D}${sbindir}/netplan |
| 43 | sed -i -e "s#/lib/netplan/generate#${base_libdir}/netplan/generate#" ${D}${datadir}/netplan/netplan/cli/utils.py | ||
| 43 | 44 | ||
| 44 | install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators | 45 | install -d ${D}/${systemd_unitdir}/system ${D}${systemd_unitdir}/system-generators |
| 45 | ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators | 46 | ln -srf ${D}/${base_libdir}/netplan/generate ${D}${systemd_unitdir}/system-generators |
| @@ -49,6 +50,7 @@ do_install() { | |||
| 49 | install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan | 50 | install -m 755 ${S}/netplan-dbus ${D}${base_libdir}/netplan |
| 50 | install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d | 51 | install -m 644 ${S}/dbus/io.netplan.Netplan.conf ${D}${datadir}/dbus-1/system.d |
| 51 | install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services | 52 | install -m 644 ${S}/dbus/io.netplan.Netplan.service ${D}${datadir}/dbus-1/system-services |
| 53 | sed -i -e "s#^Exec=/lib/#Exec=${base_libdir}/#" ${D}${datadir}/dbus-1/system-services/io.netplan.Netplan.service | ||
| 52 | fi | 54 | fi |
| 53 | 55 | ||
| 54 | install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} | 56 | install -m 755 ${S}/libnetplan.so.0.0 ${D}${libdir} |
