diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2022-04-29 21:51:10 +0800 | 
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-04-29 19:32:47 -0700 | 
| commit | 09a97158f80a779c3f45b3189adcddbd535e5baf (patch) | |
| tree | aff721d5f5e58acb920df6ce7d59d4f749261004 | |
| parent | 73d50d2b4b61b44266e03722db295d0da7866d2d (diff) | |
| download | meta-openembedded-09a97158f80a779c3f45b3189adcddbd535e5baf.tar.gz | |
frr: inherit autotools-brokensep instead of autotools
There is a parallel build error in separate build directory:
| /home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/recipe-sysroot-native/usr/lib/clippy ../git/python/clidef.py -o isisd/isis_cli_clippy.c ../git/isisd/isis_cli.c
| Traceback (most recent call last):
|   File "../git/python/clidef.py", line 466, in <module>
|     clippy.wrdiff(
|   File "/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/git/python/clippy/__init__.py", line 78, in wrdiff
|     with open(newname, "w") as out:
| FileNotFoundError: [Errno 2] No such file or directory: 'isisd/isis_cli_clippy.c.new-372541'
| make[1]: Leaving directory '/home/pokybuild/yocto-worker/meta-oe/build/build/tmp/work/core2-64-poky-linux/frr/8.2.2-r0/build'
| make[1]: *** [Makefile:17386: isisd/isis_cli_clippy.c] Error 1
This is beacuse clidef.py only creates new file but doesn't check if
parent directory exists. Inherit autotools-brokensep can fix this issue
as these parent directories always exist in source directory.
Also set ac_cv_path_PERL to '/usr/bin/env perl' to avoid path too long.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 6 | 
1 files changed, 4 insertions, 2 deletions
| diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb index b6e180e2c9..05195a3f65 100644 --- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb +++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb | |||
| @@ -26,7 +26,7 @@ COMPATIBLE_HOST:armv5 = "null" | |||
| 26 | # Error: PC-relative reference to a different section | 26 | # Error: PC-relative reference to a different section | 
| 27 | COMPATIBLE_HOST:mips64 = "null" | 27 | COMPATIBLE_HOST:mips64 = "null" | 
| 28 | 28 | ||
| 29 | inherit autotools python3native pkgconfig useradd systemd | 29 | inherit autotools-brokensep python3native pkgconfig useradd systemd | 
| 30 | 30 | ||
| 31 | DEPENDS:class-native = "bison-native elfutils-native" | 31 | DEPENDS:class-native = "bison-native elfutils-native" | 
| 32 | DEPENDS:class-target = "bison-native json-c readline c-ares libyang frr-native" | 32 | DEPENDS:class-target = "bison-native json-c readline c-ares libyang frr-native" | 
| @@ -63,6 +63,8 @@ EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \ | |||
| 63 | --with-clippy=${RECIPE_SYSROOT_NATIVE}/usr/lib/clippy \ | 63 | --with-clippy=${RECIPE_SYSROOT_NATIVE}/usr/lib/clippy \ | 
| 64 | " | 64 | " | 
| 65 | 65 | ||
| 66 | CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" | ||
| 67 | |||
| 66 | LDFLAGS:append:mips = " -latomic" | 68 | LDFLAGS:append:mips = " -latomic" | 
| 67 | LDFLAGS:append:mipsel = " -latomic" | 69 | LDFLAGS:append:mipsel = " -latomic" | 
| 68 | LDFLAGS:append:powerpc = " -latomic" | 70 | LDFLAGS:append:powerpc = " -latomic" | 
| @@ -77,7 +79,7 @@ do_compile:class-native () { | |||
| 77 | 79 | ||
| 78 | do_install:class-native () { | 80 | do_install:class-native () { | 
| 79 | install -d ${D}${libdir} | 81 | install -d ${D}${libdir} | 
| 80 | install -m 755 ${WORKDIR}/build/lib/clippy ${D}${libdir}/clippy | 82 | install -m 755 ${S}/lib/clippy ${D}${libdir}/clippy | 
| 81 | } | 83 | } | 
| 82 | 84 | ||
| 83 | do_install:append:class-target () { | 85 | do_install:append:class-target () { | 
