diff options
| author | John Klug <john.klug@multitech.com> | 2019-07-03 18:24:05 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2019-07-03 18:24:05 -0500 |
| commit | 8107f428a357894667ba890fd5295c5e72d70aa2 (patch) | |
| tree | 4e0c089db253ffc62648882110a621b154b28a95 | |
| parent | c9360c9479287f3ba229c9a37142baa5a22cce67 (diff) | |
| download | mlinux-8107f428a357894667ba890fd5295c5e72d70aa2.tar.gz mlinux-8107f428a357894667ba890fd5295c5e72d70aa2.tar.bz2 mlinux-8107f428a357894667ba890fd5295c5e72d70aa2.zip | |
Fix setkernel version and add compatibility with MTR
| -rw-r--r-- | patches/rename-mtr-conflicts-with-mtr-product.patch | 55 | ||||
| -rwxr-xr-x | setkernelversion.sh | 6 |
2 files changed, 58 insertions, 3 deletions
diff --git a/patches/rename-mtr-conflicts-with-mtr-product.patch b/patches/rename-mtr-conflicts-with-mtr-product.patch new file mode 100644 index 0000000..b98a6d9 --- /dev/null +++ b/patches/rename-mtr-conflicts-with-mtr-product.patch @@ -0,0 +1,55 @@ +diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb +--- a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb ++++ /dev/null +diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb +@@ -1,21 +0,0 @@ +-SUMMARY = "Combined traceroute and ping utility" +-DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." +-HOMEPAGE = "http://www.bitwizard.nl/mtr/" +-SECTION = "net" +-DEPENDS = "ncurses" +- +-LICENSE = "GPLv2" +-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ +- file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" +- +-SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz" +- +-SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2" +-SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06" +- +-inherit autotools +- +-EXTRA_OECONF = "--without-gtk" +- +-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +-PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb +new file mode 100644 +index 000000000..1d8a2cf9d +--- /dev/null ++++ b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb +@@ -0,0 +1,21 @@ ++SUMMARY = "Combined traceroute and ping utility" ++DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool." ++HOMEPAGE = "http://www.bitwizard.nl/mtr/" ++SECTION = "net" ++DEPENDS = "ncurses" ++ ++LICENSE = "GPLv2" ++LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ ++ file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106" ++ ++SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz" ++ ++SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2" ++SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06" ++ ++inherit autotools ++ ++EXTRA_OECONF = "--without-gtk" ++ ++PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" ++PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + diff --git a/setkernelversion.sh b/setkernelversion.sh index 04f27ce..7d7c07e 100755 --- a/setkernelversion.sh +++ b/setkernelversion.sh @@ -5,7 +5,7 @@ # revision to external kernel modules. _skv_BUILDCONF=conf/local.conf _skv_KERNELDIR=../layers/meta-multitech/recipes-kernel/linux - _skv_KERNBB=${_skv_KERNELDIR}/linux_*.bb + _skv_KERNBB=${_skv_KERNELDIR}/linux-at91_*.bb if ! [[ -f $_skv_BUILDCONF ]] ; then echo "Current directory is $(pwd) and must be the build directory." echo "ERROR: Cannot find $_skv_BUILDCONF" @@ -33,11 +33,11 @@ fi fi - _skv_krecipe=$(echo $(cd ../layers/meta-multitech/recipes-kernel/linux;echo linux_*.bb)) + _skv_krecipe=$(echo $(cd ../layers/meta-multitech/recipes-kernel/linux;echo linux-at91_*.bb)) _skv_old=$(egrep '^MLINUX_KERNEL_VERSION[[:space:]]*=' ${_skv_BUILDCONF} | tail -1) - if ((${#_skv_krecipe})) && [[ $_skv_krecipe =~ linux_(.*).bb$ ]] ; then + if ((${#_skv_krecipe})) && [[ $_skv_krecipe =~ linux-at91_(.*).bb$ ]] ; then _skv_MLINUX_KERNEL_VERSION="${BASH_REMATCH[1]}" _skv_repl="MLINUX_KERNEL_VERSION = \"${_skv_MLINUX_KERNEL_VERSION}\"" if [[ ${_skv_old} != ${_skv_repl} ]] ; then |