diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-kernel')
70 files changed, 1226 insertions, 712 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc index ade7ef9ce..160ab3084 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -3,7 +3,9 @@ HOMEPAGE = "http://cryptodev-linux.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" +SRC_URI = "http://download.gna.org/cryptodev-linux/cryptodev-linux-${PV}.tar.gz \ + file://06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch \ + file://cb186f682679383e8b5806240927903730ce85d9.patch" SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5" SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch new file mode 100644 index 000000000..cb556e1e2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch @@ -0,0 +1,54 @@ +From f14b4706b0d04988e7e5bc8c4d2aefef9f029d9d Mon Sep 17 00:00:00 2001 +From: Michael Weiser <michael.weiser@gmx.de> +Date: Fri, 5 Aug 2016 18:43:55 +0200 +Subject: [PATCH] Adjust to recent user page API changes + +4.6.0 basically renamed get_user_pages() to get_user_pages_remote() and +introduced a new get_user_pages() that always works on the current +task.[1] Distinguish the two APIs based on kernel version we're +compiling for. + +Also, there seems to have been a massive cleansing of +page_cache_release(page) in favour of put_page(page)[2] which was an +alias for put_page(page)[3] since 2.6.0. Before that beginning with +2.4.0 both page_cache_release(page) and put_page(page) have been aliases +for __free_page(page). So using put_page() instead of +page_cache_release(page) will produce identical code for anything after +2.4.0. + +[1] https://lkml.org/lkml/2016/2/10/555 +[2] https://www.spinics.net/lists/linux-fsdevel/msg95923.html +[3] https://www.spinics.net/lists/linux-fsdevel/msg95922.html +--- + zc.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +Upstream-Status: Backport [from master for 4.8 kernels] + +Index: cryptodev-linux-1.8/zc.c +=================================================================== +--- cryptodev-linux-1.8.orig/zc.c ++++ cryptodev-linux-1.8/zc.c +@@ -59,7 +59,12 @@ int __get_userbuf(uint8_t __user *addr, + } + + down_read(&mm->mmap_sem); +- ret = get_user_pages(task, mm, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) ++ ret = get_user_pages_remote( ++#else ++ ret = get_user_pages( ++#endif ++ task, mm, + (unsigned long)addr, pgcount, write, 0, pg, NULL); + up_read(&mm->mmap_sem); + if (ret != pgcount) +@@ -119,7 +124,7 @@ void release_user_pages(struct csession + else + ses->readonly_pages--; + +- page_cache_release(ses->pages[i]); ++ put_page(ses->pages[i]); + } + ses->used_pages = 0; + } diff --git a/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch new file mode 100644 index 000000000..eb0eab63b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch @@ -0,0 +1,279 @@ +From cb186f682679383e8b5806240927903730ce85d9 Mon Sep 17 00:00:00 2001 +From: Michael Weiser <michael.weiser@gmx.de> +Date: Fri, 5 Aug 2016 17:26:27 +0200 +Subject: [PATCH] Support skcipher in addition to ablkcipher API + +The ablkcipher API is being phased out[1]. The unified skcipher API +seems to have made its entry with 4.3.[3, 4] By what can be seen from +migration patches[1.ff.], it's a drop-in replacement. + +Also, deallocators such as crypto_free_skcipher() are NULL-safe now[2]. + +Add a new header cipherapi.h to aid migration from ablkcipher to skcipher and +retain support for old kernels. Make it decide which API to use and provide +appropriate function calls and type definitions. Since the ablkcipher and +skcipher APIs are so similar, those are mainly defines for corresponding +pseudo-functions in namespace cryptodev_ derived directly from their API +counterparts. + +Compiles and works (i.e. checks pass) with Debian testing 4.6.4 kernel +as well as 4.8-rc2+ Linus git tree as of today. (Both require a fix for +changed page access API[5].) + +[1] https://www.spinics.net/lists/linux-crypto/msg18133.html +[2] https://www.spinics.net/lists/linux-crypto/msg18154.html, line 120 +[3] https://www.spinics.net/lists/linux-crypto/msg16373.html +[4] https://www.spinics.net/lists/linux-crypto/msg16294.html +[5] https://github.com/cryptodev-linux/cryptodev-linux/pull/14 +--- + cipherapi.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + cryptlib.c | 40 ++++++++++++++++++---------------------- + cryptlib.h | 6 ++++-- + ioctl.c | 4 ++-- + 4 files changed, 84 insertions(+), 26 deletions(-) + create mode 100644 cipherapi.h + +Upstream-Status: Backport [from master for 4.8 kernels] + +Index: cryptodev-linux-1.8/cipherapi.h +=================================================================== +--- /dev/null ++++ cryptodev-linux-1.8/cipherapi.h +@@ -0,0 +1,60 @@ ++#ifndef CIPHERAPI_H ++# define CIPHERAPI_H ++ ++#include <linux/version.h> ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++# include <linux/crypto.h> ++ ++typedef struct ablkcipher_alg cryptodev_blkcipher_alg_t; ++typedef struct crypto_ablkcipher cryptodev_crypto_blkcipher_t; ++typedef struct ablkcipher_request cryptodev_blkcipher_request_t; ++ ++# define cryptodev_crypto_alloc_blkcipher crypto_alloc_ablkcipher ++# define cryptodev_crypto_blkcipher_alg crypto_ablkcipher_alg ++# define cryptodev_crypto_blkcipher_blocksize crypto_ablkcipher_blocksize ++# define cryptodev_crypto_blkcipher_ivsize crypto_ablkcipher_ivsize ++# define cryptodev_crypto_blkcipher_alignmask crypto_ablkcipher_alignmask ++# define cryptodev_crypto_blkcipher_setkey crypto_ablkcipher_setkey ++ ++static inline void cryptodev_crypto_free_blkcipher(cryptodev_crypto_blkcipher_t *c) { ++ if (c) ++ crypto_free_ablkcipher(c); ++} ++ ++# define cryptodev_blkcipher_request_alloc ablkcipher_request_alloc ++# define cryptodev_blkcipher_request_set_callback ablkcipher_request_set_callback ++ ++static inline void cryptodev_blkcipher_request_free(cryptodev_blkcipher_request_t *r) { ++ if (r) ++ ablkcipher_request_free(r); ++} ++ ++# define cryptodev_blkcipher_request_set_crypt ablkcipher_request_set_crypt ++# define cryptodev_crypto_blkcipher_encrypt crypto_ablkcipher_encrypt ++# define cryptodev_crypto_blkcipher_decrypt crypto_ablkcipher_decrypt ++# define cryptodev_crypto_blkcipher_tfm crypto_ablkcipher_tfm ++#else ++#include <crypto/skcipher.h> ++ ++typedef struct skcipher_alg cryptodev_blkcipher_alg_t; ++typedef struct crypto_skcipher cryptodev_crypto_blkcipher_t; ++typedef struct skcipher_request cryptodev_blkcipher_request_t; ++ ++# define cryptodev_crypto_alloc_blkcipher crypto_alloc_skcipher ++# define cryptodev_crypto_blkcipher_alg crypto_skcipher_alg ++# define cryptodev_crypto_blkcipher_blocksize crypto_skcipher_blocksize ++# define cryptodev_crypto_blkcipher_ivsize crypto_skcipher_ivsize ++# define cryptodev_crypto_blkcipher_alignmask crypto_skcipher_alignmask ++# define cryptodev_crypto_blkcipher_setkey crypto_skcipher_setkey ++# define cryptodev_crypto_free_blkcipher crypto_free_skcipher ++# define cryptodev_blkcipher_request_alloc skcipher_request_alloc ++# define cryptodev_blkcipher_request_set_callback skcipher_request_set_callback ++# define cryptodev_blkcipher_request_free skcipher_request_free ++# define cryptodev_blkcipher_request_set_crypt skcipher_request_set_crypt ++# define cryptodev_crypto_blkcipher_encrypt crypto_skcipher_encrypt ++# define cryptodev_crypto_blkcipher_decrypt crypto_skcipher_decrypt ++# define cryptodev_crypto_blkcipher_tfm crypto_skcipher_tfm ++#endif ++ ++#endif +Index: cryptodev-linux-1.8/cryptlib.c +=================================================================== +--- cryptodev-linux-1.8.orig/cryptlib.c ++++ cryptodev-linux-1.8/cryptlib.c +@@ -23,7 +23,6 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +-#include <linux/crypto.h> + #include <linux/mm.h> + #include <linux/highmem.h> + #include <linux/ioctl.h> +@@ -37,6 +36,7 @@ + #include <linux/rtnetlink.h> + #include <crypto/authenc.h> + #include "cryptodev_int.h" ++#include "cipherapi.h" + + + struct cryptodev_result { +@@ -133,15 +133,15 @@ int cryptodev_cipher_init(struct cipher_ + int ret; + + if (aead == 0) { +- struct ablkcipher_alg *alg; ++ cryptodev_blkcipher_alg_t *alg; + +- out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0); ++ out->async.s = cryptodev_crypto_alloc_blkcipher(alg_name, 0, 0); + if (unlikely(IS_ERR(out->async.s))) { + ddebug(1, "Failed to load cipher %s", alg_name); + return -EINVAL; + } + +- alg = crypto_ablkcipher_alg(out->async.s); ++ alg = cryptodev_crypto_blkcipher_alg(out->async.s); + if (alg != NULL) { + /* Was correct key length supplied? */ + if (alg->max_keysize > 0 && +@@ -154,11 +154,11 @@ int cryptodev_cipher_init(struct cipher_ + } + } + +- out->blocksize = crypto_ablkcipher_blocksize(out->async.s); +- out->ivsize = crypto_ablkcipher_ivsize(out->async.s); +- out->alignmask = crypto_ablkcipher_alignmask(out->async.s); ++ out->blocksize = cryptodev_crypto_blkcipher_blocksize(out->async.s); ++ out->ivsize = cryptodev_crypto_blkcipher_ivsize(out->async.s); ++ out->alignmask = cryptodev_crypto_blkcipher_alignmask(out->async.s); + +- ret = crypto_ablkcipher_setkey(out->async.s, keyp, keylen); ++ ret = cryptodev_crypto_blkcipher_setkey(out->async.s, keyp, keylen); + } else { + out->async.as = crypto_alloc_aead(alg_name, 0, 0); + if (unlikely(IS_ERR(out->async.as))) { +@@ -191,14 +191,14 @@ int cryptodev_cipher_init(struct cipher_ + init_completion(&out->async.result->completion); + + if (aead == 0) { +- out->async.request = ablkcipher_request_alloc(out->async.s, GFP_KERNEL); ++ out->async.request = cryptodev_blkcipher_request_alloc(out->async.s, GFP_KERNEL); + if (unlikely(!out->async.request)) { + derr(1, "error allocating async crypto request"); + ret = -ENOMEM; + goto error; + } + +- ablkcipher_request_set_callback(out->async.request, ++ cryptodev_blkcipher_request_set_callback(out->async.request, + CRYPTO_TFM_REQ_MAY_BACKLOG, + cryptodev_complete, out->async.result); + } else { +@@ -218,10 +218,8 @@ int cryptodev_cipher_init(struct cipher_ + return 0; + error: + if (aead == 0) { +- if (out->async.request) +- ablkcipher_request_free(out->async.request); +- if (out->async.s) +- crypto_free_ablkcipher(out->async.s); ++ cryptodev_blkcipher_request_free(out->async.request); ++ cryptodev_crypto_free_blkcipher(out->async.s); + } else { + if (out->async.arequest) + aead_request_free(out->async.arequest); +@@ -237,10 +235,8 @@ void cryptodev_cipher_deinit(struct ciph + { + if (cdata->init) { + if (cdata->aead == 0) { +- if (cdata->async.request) +- ablkcipher_request_free(cdata->async.request); +- if (cdata->async.s) +- crypto_free_ablkcipher(cdata->async.s); ++ cryptodev_blkcipher_request_free(cdata->async.request); ++ cryptodev_crypto_free_blkcipher(cdata->async.s); + } else { + if (cdata->async.arequest) + aead_request_free(cdata->async.arequest); +@@ -289,10 +285,10 @@ ssize_t cryptodev_cipher_encrypt(struct + reinit_completion(&cdata->async.result->completion); + + if (cdata->aead == 0) { +- ablkcipher_request_set_crypt(cdata->async.request, ++ cryptodev_blkcipher_request_set_crypt(cdata->async.request, + (struct scatterlist *)src, dst, + len, cdata->async.iv); +- ret = crypto_ablkcipher_encrypt(cdata->async.request); ++ ret = cryptodev_crypto_blkcipher_encrypt(cdata->async.request); + } else { + aead_request_set_crypt(cdata->async.arequest, + (struct scatterlist *)src, dst, +@@ -311,10 +307,10 @@ ssize_t cryptodev_cipher_decrypt(struct + + reinit_completion(&cdata->async.result->completion); + if (cdata->aead == 0) { +- ablkcipher_request_set_crypt(cdata->async.request, ++ cryptodev_blkcipher_request_set_crypt(cdata->async.request, + (struct scatterlist *)src, dst, + len, cdata->async.iv); +- ret = crypto_ablkcipher_decrypt(cdata->async.request); ++ ret = cryptodev_crypto_blkcipher_decrypt(cdata->async.request); + } else { + aead_request_set_crypt(cdata->async.arequest, + (struct scatterlist *)src, dst, +Index: cryptodev-linux-1.8/cryptlib.h +=================================================================== +--- cryptodev-linux-1.8.orig/cryptlib.h ++++ cryptodev-linux-1.8/cryptlib.h +@@ -3,6 +3,8 @@ + + #include <linux/version.h> + ++#include "cipherapi.h" ++ + struct cipher_data { + int init; /* 0 uninitialized */ + int blocksize; +@@ -12,8 +14,8 @@ struct cipher_data { + int alignmask; + struct { + /* block ciphers */ +- struct crypto_ablkcipher *s; +- struct ablkcipher_request *request; ++ cryptodev_crypto_blkcipher_t *s; ++ cryptodev_blkcipher_request_t *request; + + /* AEAD ciphers */ + struct crypto_aead *as; +Index: cryptodev-linux-1.8/ioctl.c +=================================================================== +--- cryptodev-linux-1.8.orig/ioctl.c ++++ cryptodev-linux-1.8/ioctl.c +@@ -34,7 +34,6 @@ + */ + + #include <crypto/hash.h> +-#include <linux/crypto.h> + #include <linux/mm.h> + #include <linux/highmem.h> + #include <linux/ioctl.h> +@@ -53,6 +52,7 @@ + #include "cryptodev_int.h" + #include "zc.h" + #include "version.h" ++#include "cipherapi.h" + + MODULE_AUTHOR("Nikos Mavrogiannopoulos <nmav@gnutls.org>"); + MODULE_DESCRIPTION("CryptoDev driver"); +@@ -765,7 +765,7 @@ static int get_session_info(struct fcryp + + if (ses_ptr->cdata.init) { + if (ses_ptr->cdata.aead == 0) +- tfm = crypto_ablkcipher_tfm(ses_ptr->cdata.async.s); ++ tfm = cryptodev_crypto_blkcipher_tfm(ses_ptr->cdata.async.s); + else + tfm = crypto_aead_tfm(ses_ptr->cdata.async.as); + tfm_info_to_alg_info(&siop->cipher_info, tfm); diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb index 445d03a87..d8041ddd3 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/kern-tools/kern-tools-native_git.bb @@ -1,10 +1,10 @@ SUMMARY = "Tools for managing Yocto Project style branched kernels" LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=d8d1d729a70cd5f52972f8884b80743d" +LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=a6c2fa8aef1bda400e2828845ba0d06c" DEPENDS = "git-native" -SRCREV = "17d89d1861b532bbf1a81c1f024953e440db8de7" +SRCREV = "9a3995ee8daabf37e92e1b51b133cf8582d85809" PR = "r12" PV = "0.2+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc index 758a3a78b..bdfe024a7 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools.inc @@ -22,6 +22,10 @@ COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|fre INSANE_SKIP_${PN} = "arch" do_compile_prepend() { + # Remove the prepackaged config.h from the source tree as it overrides + # the same file generated by configure and placed in the build tree + rm -f ${S}/include/config.h + # Remove the '*.d' file to make sure the recompile is OK for dep in `find ${B} -type f -name '*.d'`; do dep_no_d="`echo $dep | sed 's#.d$##'`" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump index 3fb133fb3..2347205ed 100755 --- a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump +++ b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump @@ -8,23 +8,7 @@ # #default -KDUMP_KVER="`uname -r`" -KDUMP_KIMAGE="/boot/bzImage-${KDUMP_KVER}" -KDUMP_CMDLINE="`cat /proc/cmdline`" -KDUMP_CMDLINE_APPEND="kdump_needed maxcpus=1 irqpoll reset_devices" -KDUMP_VMCORE_PATH="/var/crash/`date +"%Y-%m-%d"`" - -#get right kernel image -march="`uname -m`" -case ${march} in - x86*|i?86) - ;; - *) - KDUMP_KIMAGE="/boot/uImage-${KDUMP_KVER}" - ;; -esac - -KEXEC=usr/sbin/kexec +KEXEC=/usr/sbin/kexec KEXEC_ARGS="-p" MAKEDUMPFILE=/usr/bin/makedumpfile @@ -34,6 +18,9 @@ LOGGER="logger -p info -t kdump" if [ -f /etc/sysconfig/kdump.conf ]; then . /etc/sysconfig/kdump.conf +else + echo "no /etc/sysconfig/kdump.conf" + exit 1; fi do_check() @@ -41,24 +28,33 @@ do_check() #check makedumpfile if [ ! -e ${MAKEDUMPFILE} -o ! -x ${MAKEDUMPFILE} ] ;then echo "No makedumpfile found." - return 1; + exit 0 fi #check kexec if [ ! -e ${KEXEC} -o ! -x ${KEXEC} ] ;then echo "No kexec found." - return 1; + exit 0 fi #check whether kdump kernel image exists on the system - if [ ! -f ${KDUMP_KIMAGE} ]; then + if [ -z "${KDUMP_KIMAGE}" -o ! -f "${KDUMP_KIMAGE}" ]; then echo "No kdump kernel image found." - return 1 + exit 0 + fi + + if [ "${KDUMP_CMDLINE}"x = "x" ] ; then + echo "KDUMP_CMDLINE is not configured" + exit 0 fi } do_save_vmcore() { + if [ ${KDUMP_VMCORE_PATH}x = x ]; then + KDUMP_VMCORE_PATH="/var/crash/`date +"%Y-%m-%d"`" + fi + mkdir -p ${KDUMP_VMCORE_PATH} echo "Saving a vmcore to ${KDUMP_VMCORE_PATH}." @@ -101,20 +97,6 @@ do_start() return 1 fi - #handle kdump cmdline parameters, remove some useless options - kcmdline="" - for x in `cat /proc/cmdline`; do - case $x in - crashkernel*) - ;; - *) - kcmdline="${kcmdline} $x" - ;; - esac - done - - KDUMP_CMDLINE="${kcmdline} ${KDUMP_CMDLINE_APPEND}" - #Load the kdump kernel image ${KEXEC} ${KEXEC_ARGS} "${KDUMP_KIMAGE}" --append="${KDUMP_CMDLINE}" if [ $? != 0 ]; then diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf index 42a2435b9..38190d207 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf +++ b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kdump.conf @@ -1,13 +1,9 @@ #the kdump kernel version string. #KDUMP_KVER="`uname -r`" -#this will be passed to the kdump kernel as kdump kernel command line, it -#usually comes from /proc/cmdline +#this will be passed to the kdump kernel as kdump kernel command line #KDUMP_CMDLINE="`cat /proc/cmdline`" -# append arguments to the kdump commandline -#KDUMP_CMDLINE_APPEND="kdump_needed maxcpus=1 irqpoll reset_devices" - #the kernel image for kdump #KDUMP_KIMAGE="/boot/bzImage-${KDUMP_KVER}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch deleted file mode 100644 index e198eb6e9..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch +++ /dev/null @@ -1,48 +0,0 @@ -kexec-tools: Refine kdump device_tree sort - -The commit b02d735bf was to rearrange the device-tree entries, and -assumed that these entries are sorted in the ascending order. but -acctually when I was validating kexec and kdump, the order of -serial node still is changed. So the patch is to sort these entries -by the directory name in ascending order. - -Upstream-Status: Pending - -Signed-off-by: Yang Wei <Wei.Yang@windriver.com> -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> ---- - kexec/arch/ppc/fs2dt.c | 13 ++++++++++--- - kexec/fs2dt.c | 13 ++++++++++--- - 2 files changed, 20 insertions(+), 6 deletions(-) - -Index: kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c -=================================================================== ---- kexec-tools-2.0.10.orig/kexec/arch/ppc/fs2dt.c -+++ kexec-tools-2.0.10/kexec/arch/ppc/fs2dt.c -@@ -296,6 +296,9 @@ static int comparefunc(const void *dentr - { - char *str1 = (*(struct dirent **)dentry1)->d_name; - char *str2 = (*(struct dirent **)dentry2)->d_name; -+ char* ptr1 = strchr(str1, '@'); -+ char* ptr2 = strchr(str2, '@'); -+ int len1, len2; - - /* - * strcmp scans from left to right and fails to idetify for some -@@ -303,9 +306,13 @@ static int comparefunc(const void *dentr - * Therefore, we get the wrong sorted order like memory@10000000 and - * memory@f000000. - */ -- if (strchr(str1, '@') && strchr(str2, '@') && -- (strlen(str1) > strlen(str2))) -- return 1; -+ if (ptr1 && ptr2) { -+ len1 = ptr1 - str1; -+ len2 = ptr2 - str2; -+ if (!strncmp(str1, str2, len1 >len2 ? len1: len2) && -+ (strlen(str1) > strlen(str2))) -+ return 1; -+ } - - return strcmp(str1, str2); - } diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb index c1c97af9e..59376c804 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.11.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/kexec/kexec-tools_2.0.12.bb @@ -2,7 +2,7 @@ require kexec-tools.inc export LDFLAGS = "-L${STAGING_LIBDIR}" EXTRA_OECONF = " --with-zlib=yes" -SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \ +SRC_URI += " \ file://kexec-aarch64.patch \ file://kexec-x32.patch \ file://0002-powerpc-change-the-memory-size-limit.patch \ @@ -10,8 +10,8 @@ SRC_URI += "file://kexec-tools-Refine-kdump-device_tree-sort.patch \ file://0001-vmcore-dmesg-Define-_GNU_SOURCE.patch \ " -SRC_URI[md5sum] = "86de066859f289048f1b286af6f03f78" -SRC_URI[sha256sum] = "84f652ebf1de3f7b9de757a50cdbf6d5639d88c1d5b5ef9f525edde5ef9590c2" +SRC_URI[md5sum] = "10ddaae0e86af54407b164a1f5a39cc3" +SRC_URI[sha256sum] = "cc7b60dad0da202004048a6179d8a53606943062dd627a2edba45a8ea3a85135" PACKAGES =+ "kexec kdump vmcore-dmesg" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb b/import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb index c2c258910..5c7dd52f5 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/kmod/depmodwrapper-cross_1.0.bb @@ -41,10 +41,6 @@ EOF chmod +x ${D}${bindir_crossscripts}/depmodwrapper } -SYSROOT_PREPROCESS_FUNCS += "depmodwrapper_sysroot_preprocess" - -depmodwrapper_sysroot_preprocess () { - sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts} -} +SYSROOT_DIRS += "${bindir_crossscripts}" inherit nopackages diff --git a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc b/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc index 0bcdcf673..166b3f02f 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/kmod/kmod.inc @@ -9,16 +9,14 @@ LICENSE = "GPL-2.0+ & LGPL-2.1+" LICENSE_libkmod = "LGPL-2.1+" SECTION = "base" -DEPENDS += "pkgconfig-native" - LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " -inherit autotools gtk-doc +inherit autotools gtk-doc pkgconfig -SRCREV = "42f32b8ae45ad8e3a1da29c9b20af9b5e2e9e676" +SRCREV = "65a885df5f6f15222b44fd695c5eaca17e837a14" # Lookout for PV bump too when SRCREV is changed -PV = "22+git${SRCPV}" +PV = "23+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ file://depmod-search.conf \ @@ -35,7 +33,7 @@ PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" do_configure_prepend () { - gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make + gtkdocize --docdir ${S}/libkmod/docs --srcdir ${S} } do_configure_append () { diff --git a/import-layers/yocto-poky/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch b/import-layers/yocto-poky/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch new file mode 100644 index 000000000..25d47ef12 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/libpfm/files/fix-misleading-indentation-error.patch @@ -0,0 +1,38 @@ +Upstream-Status: Pending + +Fix compile error: + +| syst_count.c:346:3: error: this 'for' clause does not guard... [-Werror=misleading-indentation] +| for(c=cmin ; c < cmax; c++) +| ^~~ + +Signed-off-by: Kai Kang <kai.kang@windriver.com> +--- +diff --git a/perf_examples/syst_count.c b/perf_examples/syst_count.c +index 0d53078..2dfb9b9 100644 +--- a/perf_examples/syst_count.c ++++ b/perf_examples/syst_count.c +@@ -343,8 +343,9 @@ measure(void) + + for (delay = 1 ; delay <= options.delay; delay++) { + +- for(c=cmin ; c < cmax; c++) +- start_cpu(c); ++ for(c=cmin ; c < cmax; c++) { ++ start_cpu(c); ++ } + + if (0) { + tv.tv_sec = 0; +@@ -353,8 +354,9 @@ measure(void) + } else + sleep(1); + +- for(c=cmin ; c < cmax; c++) +- stop_cpu(c); ++ for(c=cmin ; c < cmax; c++) { ++ stop_cpu(c); ++ } + + for(c = cmin; c < cmax; c++) { + printf("# %'ds -----\n", delay); diff --git a/import-layers/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb b/import-layers/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb index 0b024ad61..4136eac81 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/libpfm/libpfm4_4.6.0.bb @@ -14,6 +14,7 @@ COMPATIBLE_HOST = "powerpc64" SRC_URI = "http://downloads.sourceforge.net/project/perfmon2/${BPN}/libpfm-${PV}.tar.gz \ file://0001-Makefile-Add-LDFLAGS-variable-to-SLDFLAGS.patch \ + file://fix-misleading-indentation-error.patch \ " SRC_URI[md5sum] = "5077b9022440e4951d96f2d0e73bd487" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index a4e64d549..8e68ae823 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -55,13 +55,14 @@ LICENSE = "\ & Firmware-xc4000 \ & Firmware-xc5000 \ & Firmware-xc5000c \ + & WHENCE \ " LIC_FILES_CHKSUM = "\ file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \ - file://LICENSE.amdgpu;md5=a8592c24c2672062e03c7392fc7fe3bc \ + file://LICENSE.amdgpu;md5=3fe8a3430700a518990c3b3d75297209 \ file://LICENSE.amd-ucode;md5=3a0de451253cc1edbf30a3c621effee3 \ file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \ file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ @@ -97,7 +98,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.QualcommAtheros_ar3k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENSE.QualcommAtheros_ath10k;md5=b5fe244fb2b532311de1472a3bc06da5 \ file://LICENCE.r8a779x_usb3;md5=4c1671656153025d7076105a5da7e498 \ - file://LICENSE.radeon;md5=6c7f97c6c62bdd9596d0238bb205118c \ + file://LICENSE.radeon;md5=69612f4f7b141a97659cb1d609a1bde2 \ file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 \ file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \ file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \ @@ -111,6 +112,7 @@ LIC_FILES_CHKSUM = "\ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ + file://WHENCE;md5=f514a0c53c5d73c2fe98d5861103f0c6 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -168,13 +170,20 @@ NO_GENERIC_LICENSE[Firmware-wl1251] = "LICENCE.wl1251" NO_GENERIC_LICENSE[Firmware-xc4000] = "LICENCE.xc4000" NO_GENERIC_LICENSE[Firmware-xc5000] = "LICENCE.xc5000" NO_GENERIC_LICENSE[Firmware-xc5000c] = "LICENCE.xc5000c" +NO_GENERIC_LICENSE[WHENCE] = "WHENCE" -SRCREV = "5f8ca0c1db6106a2d6d7e85eee778917ff03c3de" +SRCREV = "42ad5367dd38371b2a1bb263b6efa85f9b92fc93" PE = "1" PV = "0.0+git${SRCPV}" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" +# Some devices need a specific version, not the latest +SRC_URI += "https://git.kernel.org/cgit/linux/kernel/git/iwlwifi/linux-firmware.git/plain/iwlwifi-8000C-19.ucode;name=iwlwifi-19" + +SRC_URI[iwlwifi-19.md5sum] = "132fbaee36beec5e98714f0bd66f7a1d" +SRC_URI[iwlwifi-19.sha256sum] = "2034470df64d323b827c4f2d4d0d55be2846b7360179b5574aa28ff77b6c9471" + S = "${WORKDIR}/git" inherit allarch update-alternatives @@ -204,6 +213,9 @@ do_install() { # fixup wl12xx location, after 2.6.37 the kernel searches a different location for it ( cd ${D}/lib/firmware ; ln -sf ti-connectivity/* . ) + + # Copy the iwlwifi ucode + cp ${WORKDIR}/iwlwifi-8000C-19.ucode ${D}/lib/firmware/ } @@ -213,11 +225,12 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-ti-connectivity-license ${PN}-wl12xx ${PN}-wl18xx \ ${PN}-vt6656-license ${PN}-vt6656 \ ${PN}-rtl-license ${PN}-rtl8192cu ${PN}-rtl8192ce ${PN}-rtl8192su \ - ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm4354 \ - ${PN}-atheros-license ${PN}-ar9170 ${PN}-ath6k ${PN}-ath9k \ + ${PN}-broadcom-license ${PN}-bcm4329 ${PN}-bcm4330 ${PN}-bcm4334 ${PN}-bcm43340 ${PN}-bcm4339 ${PN}-bcm43430 ${PN}-bcm4354 \ + ${PN}-atheros-license ${PN}-ar9170 ${PN}-carl9170 ${PN}-ath6k ${PN}-ath9k \ ${PN}-ar3k-license ${PN}-ar3k ${PN}-ath10k-license ${PN}-ath10k \ \ - ${PN}-iwlwifi-license ${PN}-iwlwifi-135-6 \ + ${PN}-iwlwifi-license ${PN}-iwlwifi \ + ${PN}-iwlwifi-135-6 \ ${PN}-iwlwifi-3160-7 ${PN}-iwlwifi-3160-8 ${PN}-iwlwifi-3160-9 \ ${PN}-iwlwifi-6000-4 ${PN}-iwlwifi-6000g2a-5 ${PN}-iwlwifi-6000g2a-6 \ ${PN}-iwlwifi-6000g2b-5 ${PN}-iwlwifi-6000g2b-6 \ @@ -225,8 +238,11 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ ${PN}-iwlwifi-7260 \ ${PN}-iwlwifi-7265 \ ${PN}-iwlwifi-7265d ${PN}-iwlwifi-8000c ${PN}-iwlwifi-8265 \ + ${PN}-iwlwifi-misc \ ${PN}-i915-license ${PN}-i915 \ ${PN}-adsp-sst-license ${PN}-adsp-sst \ + ${PN}-bnx2-mips \ + ${PN}-whence-license \ ${PN}-license \ " @@ -234,11 +250,15 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \ LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" +LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" FILES_${PN}-atheros-license = "/lib/firmware/LICENCE.atheros_firmware" FILES_${PN}-ar9170 = " \ /lib/firmware/ar9170*.fw \ " +FILES_${PN}-carl9170 = " \ + /lib/firmware/carl9170*.fw \ +" FILES_${PN}-ath6k = " \ /lib/firmware/ath6k \ " @@ -250,12 +270,15 @@ FILES_${PN}-ath9k = " \ " RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" +RDEPENDS_${PN}-carl9170 += "${PN}-atheros-license" RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" # For QualCommAthos LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" +LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" +LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" FILES_${PN}-ar3k-license = "/lib/firmware/LICENSE.QualcommAtheros_ar3k" FILES_${PN}-ar3k = " \ @@ -272,6 +295,7 @@ RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" # For ralink LICENSE_${PN}-ralink = "Firmware-ralink-firmware" +LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" FILES_${PN}-ralink-license = "/lib/firmware/LICENCE.ralink-firmware.txt" FILES_${PN}-ralink = " \ @@ -282,6 +306,7 @@ RDEPENDS_${PN}-ralink += "${PN}-ralink-license" # For radeon LICENSE_${PN}-radeon = "Firmware-radeon" +LICENSE_${PN}-radeon-license = "Firmware-radeon" FILES_${PN}-radeon-license = "/lib/firmware/LICENSE.radeon" FILES_${PN}-radeon = " \ @@ -295,6 +320,7 @@ LICENSE_${PN}-sd8686 = "Firmware-Marvell" LICENSE_${PN}-sd8688 = "Firmware-Marvell" LICENSE_${PN}-sd8787 = "Firmware-Marvell" LICENSE_${PN}-sd8797 = "Firmware-Marvell" +LICENSE_${PN}-marvell-license = "Firmware-Marvell" FILES_${PN}-marvell-license = "/lib/firmware/LICENCE.Marvell" FILES_${PN}-sd8686 = " \ @@ -321,6 +347,7 @@ RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" +LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" FILES_${PN}-rtl-license = " \ /lib/firmware/LICENCE.rtlwifi_firmware.txt \ @@ -342,6 +369,7 @@ RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license" # For ti-connectivity LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" +LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" FILES_${PN}-ti-connectivity-license = "/lib/firmware/LICENCE.ti-connectivity" FILES_${PN}-wl12xx = " \ @@ -360,6 +388,7 @@ RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license" # For vt6656 LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" +LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" FILES_${PN}-vt6656-license = "/lib/firmware/LICENCE.via_vt6656" FILES_${PN}-vt6656 = " \ @@ -379,7 +408,9 @@ LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx" LICENSE_${PN}-bcm43340 = "Firmware-broadcom_bcm43xx" LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" +LICENSE_${PN}-bcm43430 = "Firmware-broadcom_bcm43xx" LICENSE_${PN}-bcm4354 = "Firmware-broadcom_bcm43xx" +LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" FILES_${PN}-broadcom-license = " \ /lib/firmware/LICENCE.broadcom_bcm43xx \ @@ -399,6 +430,9 @@ FILES_${PN}-bcm43340 = " \ FILES_${PN}-bcm4339 = " \ /lib/firmware/brcm/brcmfmac4339-sdio.bin \ " +FILES_${PN}-bcm43430 = " \ + /lib/firmware/brcm/brcmfmac43430-sdio.bin \ +" FILES_${PN}-bcm4354 = " \ /lib/firmware/brcm/brcmfmac4354-sdio.bin \ " @@ -417,15 +451,33 @@ ALTERNATIVE_linux-firmware-bcm4330 = "brcmfmac-sdio.bin" ALTERNATIVE_TARGET_linux-firmware-bcm4330[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4330-sdio.bin" ALTERNATIVE_linux-firmware-bcm4339 = "brcmfmac-sdio.bin" ALTERNATIVE_TARGET_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac4339-sdio.bin" +ALTERNATIVE_PRIORITY_linux-firmware-bcm4339[brcmfmac-sdio.bin] = "20" +ALTERNATIVE_linux-firmware-bcm43430 = "brcmfmac-sdio.bin" +ALTERNATIVE_TARGET_linux-firmware-bcm43430[brcmfmac-sdio.bin] = "/lib/firmware/brcm/brcmfmac43430-sdio.bin" RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm43340 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" +RDEPENDS_${PN}-bcm43430 += "${PN}-broadcom-license" RDEPENDS_${PN}-bcm4354 += "${PN}-broadcom-license" +# For Broadcom bnx2-mips +# +# which is a separate case to the other Broadcom firmwares since its +# license is contained in the shared WHENCE file. + +LICENSE_${PN}-bnx2-mips = "WHENCE" +LICENSE_${PN}-whence-license = "WHENCE" + +FILES_${PN}-bnx2-mips = "/lib/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" +FILES_${PN}-whence-license = "/lib/firmware/WHENCE" + +RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" + # For iwlwifi +LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" @@ -433,7 +485,7 @@ LICENSE_${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware" -LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" @@ -442,6 +494,8 @@ LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware" +LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" FILES_${PN}-iwlwifi-license = "/lib/firmware/LICENCE.iwlwifi_firmware" @@ -461,6 +515,7 @@ FILES_${PN}-iwlwifi-7265 = "/lib/firmware/iwlwifi-7265-*.ucode" FILES_${PN}-iwlwifi-7265d = "/lib/firmware/iwlwifi-7265D-*.ucode" FILES_${PN}-iwlwifi-8000c = "/lib/firmware/iwlwifi-8000C-*.ucode" FILES_${PN}-iwlwifi-8265 = "/lib/firmware/iwlwifi-8265-*.ucode" +FILES_${PN}-iwlwifi-misc = "/lib/firmware/iwlwifi-*.ucode" RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" @@ -469,7 +524,7 @@ RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" -RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" @@ -478,6 +533,15 @@ RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" +RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license" + +# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi +# firmwares that are not already included in other -iwlwifi- packages. +# -iwlwifi is a virtual package that depends upon all iwlwifi packages. +# These are distinct in order to allow the -misc firmwares to be installed +# without pulling in every other iwlwifi package. +ALLOW_EMPTY_${PN}-iwlwifi = "1" +ALLOW_EMPTY_${PN}-iwlwifi-misc = "1" # Handle package updating for the newly merged iwlwifi groupings RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" @@ -489,12 +553,14 @@ RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}- RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" LICENSE_${PN}-i915 = "Firmware-i915" +LICENSE_${PN}-i915-license = "Firmware-i915" FILES_${PN}-i915-license = "/lib/firmware/LICENSE.i915" FILES_${PN}-i915 = "/lib/firmware/i915" RDEPENDS_${PN}-i915 = "${PN}-i915-license" FILES_${PN}-adsp-sst-license = "/lib/firmware/LICENCE.adsp_sst" LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" +LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" FILES_${PN}-adsp-sst = "/lib/firmware/intel/dsp_fw*" RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" @@ -534,6 +600,7 @@ LICENSE_${PN} = "\ & Firmware-r8a779x_usb3 \ & Firmware-radeon \ & Firmware-ralink_a_mediatek_company_firmware \ + & Firmware-ralink-firmware \ & Firmware-siano \ & Firmware-tda7706-firmware \ & Firmware-ti-connectivity \ @@ -543,14 +610,20 @@ LICENSE_${PN} = "\ & Firmware-xc4000 \ & Firmware-xc5000 \ & Firmware-xc5000c \ + & WHENCE \ " FILES_${PN}-license += "/lib/firmware/LICEN*" FILES_${PN} += "/lib/firmware/*" RDEPENDS_${PN} += "${PN}-license" +RDEPENDS_${PN} += "${PN}-whence-license" # Make linux-firmware depend on all of the split-out packages. +# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. python populate_packages_prepend () { firmware_pkgs = oe.utils.packages_filter_out_system(d) d.appendVar('RDEPENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) + + iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) + d.appendVar('RDEPENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) } diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 2ba6ed51d..078d752ca 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -18,9 +18,10 @@ LICENSE = "GPLv2" # But you have some kernel headers you need for some driver? That is fine # but get them from STAGING_KERNEL_DIR where the kernel installs itself. # This will make the package using them machine specific but this is much -# better than having a machine specific C library. This does mean your -# recipe needs a DEPENDS += "virtual/kernel" but again, that is fine and -# makes total sense. +# better than having a machine specific C library. This does mean your +# recipe needs a +# do_configure[depends] += "virtual/kernel:do_shared_workdir" +# but again, that is fine and makes total sense. # # There can also be a case where your kernel extremely old and you want # an older libc ABI for that old kernel. The headers installed by this @@ -49,8 +50,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar S = "${WORKDIR}/linux-${PV}" -# For the kernel, we don't want the '-e MAKEFLAGS=' in EXTRA_OEMAKE. -EXTRA_OEMAKE = "" +EXTRA_OEMAKE = " HOSTCC="${BUILD_CC}" HOSTCPP="${BUILD_CPP}"" do_configure() { oe_runmake allnoconfig diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch index 6ad479863..8bb775ccf 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch @@ -11,10 +11,10 @@ Upstream-Status: Submitted include/uapi/linux/libc-compat.h | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) -Index: linux-4.4/include/uapi/linux/libc-compat.h +Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h =================================================================== ---- linux-4.4.orig/include/uapi/linux/libc-compat.h -+++ linux-4.4/include/uapi/linux/libc-compat.h +--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h ++++ linux-4.8-rc4/include/uapi/linux/libc-compat.h @@ -48,13 +48,12 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H @@ -23,16 +23,17 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h -#if defined(__GLIBC__) +#ifndef __KERNEL__ /* we're used from userspace */ --/* Coordinate with glibc netinet/in.h header. */ -+/* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) +-/* Coordinate with glibc net/if.h header. */ +-#if defined(_NET_IF_H) && defined(__USE_MISC) ++/* Coordinate with libc net/if.h header. */ ++#if defined(_NET_IF_H) -/* GLIBC headers included first so don't define anything +/* LIBC headers included first so don't define anything * that would already be defined. */ - #define __UAPI_DEF_IN_ADDR 0 - #define __UAPI_DEF_IN_IPPROTO 0 -@@ -64,15 +63,7 @@ + + #define __UAPI_DEF_IF_IFCONF 0 +@@ -98,15 +97,7 @@ #define __UAPI_DEF_IN_CLASS 0 #define __UAPI_DEF_IN6_ADDR 0 @@ -48,7 +49,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h #define __UAPI_DEF_SOCKADDR_IN6 0 #define __UAPI_DEF_IPV6_MREQ 0 #define __UAPI_DEF_IPPROTO_V6 0 -@@ -80,10 +71,10 @@ +@@ -114,10 +105,10 @@ #define __UAPI_DEF_IN6_PKTINFO 0 #define __UAPI_DEF_IP6_MTUINFO 0 @@ -61,7 +62,7 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h * __UAPI_DEF_* defines and adjust appropriately. */ #define __UAPI_DEF_IN_ADDR 1 #define __UAPI_DEF_IN_IPPROTO 1 -@@ -93,7 +84,7 @@ +@@ -127,7 +118,7 @@ #define __UAPI_DEF_IN_CLASS 1 #define __UAPI_DEF_IN6_ADDR 1 @@ -70,16 +71,16 @@ Index: linux-4.4/include/uapi/linux/libc-compat.h * coordinate. */ #define __UAPI_DEF_IN6_ADDR_ALT 1 #define __UAPI_DEF_SOCKADDR_IN6 1 -@@ -115,7 +106,7 @@ +@@ -149,7 +140,7 @@ /* If we did not see any headers from any supported C libraries, * or we are being included in the kernel, then define everything * that we need. */ -#else /* !defined(__GLIBC__) */ +#else /* __KERNEL__ */ - /* Definitions for in.h */ - #define __UAPI_DEF_IN_ADDR 1 -@@ -138,6 +129,6 @@ + /* Definitions for if.h */ + #define __UAPI_DEF_IF_IFCONF 1 +@@ -182,6 +173,6 @@ /* Definitions for xattr.h */ #define __UAPI_DEF_XATTR 1 diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch index c61709374..8dc1edc33 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch @@ -11,10 +11,10 @@ Upstream-Status: Submitted include/uapi/linux/libc-compat.h | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h -index aa63ed0..e94da57 100644 ---- a/include/uapi/linux/if_ether.h -+++ b/include/uapi/linux/if_ether.h +Index: linux-4.8-rc4/include/uapi/linux/if_ether.h +=================================================================== +--- linux-4.8-rc4.orig/include/uapi/linux/if_ether.h ++++ linux-4.8-rc4/include/uapi/linux/if_ether.h @@ -22,6 +22,7 @@ #define _UAPI_LINUX_IF_ETHER_H @@ -23,7 +23,7 @@ index aa63ed0..e94da57 100644 /* * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble -@@ -134,11 +135,12 @@ +@@ -138,11 +139,12 @@ * This is an Ethernet frame header. */ @@ -37,10 +37,10 @@ index aa63ed0..e94da57 100644 +#endif #endif /* _UAPI_LINUX_IF_ETHER_H */ -diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h -index afe15c2..7d0c78a 100644 ---- a/include/uapi/linux/libc-compat.h -+++ b/include/uapi/linux/libc-compat.h +Index: linux-4.8-rc4/include/uapi/linux/libc-compat.h +=================================================================== +--- linux-4.8-rc4.orig/include/uapi/linux/libc-compat.h ++++ linux-4.8-rc4/include/uapi/linux/libc-compat.h @@ -50,6 +50,12 @@ #ifndef __KERNEL__ /* we're used from userspace */ @@ -51,9 +51,6 @@ index afe15c2..7d0c78a 100644 +#define __UAPI_DEF_ETHHDR 1 +#endif + - /* Coordinate with libc netinet/in.h header. */ - #if defined(_NETINET_IN_H) + /* Coordinate with libc net/if.h header. */ + #if defined(_NET_IF_H) && defined(__USE_MISC) --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch index 6d9e8d864..b5c4e1750 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch @@ -13,10 +13,10 @@ Upstream-Status: Submitted include/uapi/linux/kernel.h | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h -index 321e399..e8ff821 100644 ---- a/include/uapi/linux/kernel.h -+++ b/include/uapi/linux/kernel.h +Index: linux-4.8-rc4/include/uapi/linux/kernel.h +=================================================================== +--- linux-4.8-rc4.orig/include/uapi/linux/kernel.h ++++ linux-4.8-rc4/include/uapi/linux/kernel.h @@ -1,7 +1,9 @@ #ifndef _UAPI_LINUX_KERNEL_H #define _UAPI_LINUX_KERNEL_H @@ -27,6 +27,3 @@ index 321e399..e8ff821 100644 /* * 'kernel.h' contains some often-used function prototypes etc --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb new file mode 100644 index 000000000..77e0870d3 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_4.8.bb @@ -0,0 +1,12 @@ +require linux-libc-headers.inc + +PV = "4.8" + +SRC_URI_append_libc-musl = "\ + file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ + file://0002-libc-compat.h-prevent-redefinition-of-struct-ethhdr.patch \ + file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ + " + +SRC_URI[md5sum] = "c1af0afbd3df35c1ccdc7a5118cd2d07" +SRC_URI[sha256sum] = "3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb index 196c8c7a2..0fdd0ad5f 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/kernel-devsrc.bb @@ -28,9 +28,6 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_populate_sysroot[noexec] = "1" -# Define where the kernel headers are installed on the target as well as where -# they are staged. -KERNEL_SRC_PATH = "/usr/src/kernel" S = "${STAGING_KERNEL_DIR}" B = "${STAGING_KERNEL_BUILDDIR}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc index 74f5ef8ca..8528d646d 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dtb.inc @@ -33,12 +33,13 @@ do_compile_append() { do_install_append() { for DTB in ${KERNEL_DEVICETREE}; do DTB=`normalize_dtb "${DTB}"` - DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` - install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.dtb + install -m 0644 ${DTB_PATH} ${D}/${KERNEL_IMAGEDEST}/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} done done } @@ -46,7 +47,8 @@ do_install_append() { do_deploy_append() { for DTB in ${KERNEL_DEVICETREE}; do DTB=`normalize_dtb "${DTB}"` - DTB_BASE_NAME=`basename ${DTB} .dtb` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do base_name=${type}"-"${KERNEL_IMAGE_BASE_NAME} symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} @@ -54,8 +56,8 @@ do_deploy_append() { DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` DTB_PATH=`get_real_dtb_path_in_kernel "${DTB}"` install -d ${DEPLOYDIR} - install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.dtb - ln -sf ${DTB_NAME}.dtb ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.dtb + install -m 0644 ${DTB_PATH} ${DEPLOYDIR}/${DTB_NAME}.${DTB_EXT} + ln -sf ${DTB_NAME}.${DTB_EXT} ${DEPLOYDIR}/${DTB_SYMLINK_NAME}.${DTB_EXT} done done } @@ -65,9 +67,10 @@ pkg_postinst_kernel-devicetree () { for DTB in ${KERNEL_DEVICETREE}; do for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} + DTB_EXT=${DTB##*.} DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.dtb ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true + update-alternatives --install /${KERNEL_IMAGEDEST}/${DTB_BASE_NAME}.${DTB_EXT} ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true done done } @@ -77,9 +80,10 @@ pkg_postrm_kernel-devicetree () { for DTB in ${KERNEL_DEVICETREE}; do for type in ${KERNEL_IMAGETYPE_FOR_MAKE}; do symlink_name=${type}"-"${KERNEL_IMAGE_SYMLINK_NAME} + DTB_EXT=${DTB##*.} DTB_BASE_NAME=`basename ${DTB} | awk -F "." '{print $1}'` DTB_SYMLINK_NAME=`echo ${symlink_name} | sed "s/${MACHINE}/${DTB_BASE_NAME}/g"` - update-alternatives --remove ${DTB_BASE_NAME}.dtb /boot/devicetree-${DTB_SYMLINK_NAME}.dtb ${KERNEL_PRIORITY} || true + update-alternatives --remove ${DTB_BASE_NAME}.${DTB_EXT} /boot/devicetree-${DTB_SYMLINK_NAME}.${DTB_EXT} ${KERNEL_PRIORITY} || true done done } diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb index cc0e4e64a..994ac7459 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-dummy.bb @@ -18,6 +18,8 @@ FILES_kernel-modules = "" ALLOW_EMPTY_kernel-modules = "1" DESCRIPTION_kernel-modules = "Kernel modules meta package" +INHIBIT_DEFAULT_DEPS = "1" + #COMPATIBLE_MACHINE = "your_machine" PR = "r1" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb index 308526345..9154bb7c3 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-dev.bb @@ -14,14 +14,6 @@ require recipes-kernel/linux/linux-yocto.inc # provide this .inc to set specific revisions include recipes-kernel/linux/linux-yocto-dev-revisions.inc -# Skip processing of this recipe if it is not explicitly specified as the -# PREFERRED_PROVIDER for virtual/kernel. This avoids network access required -# by the use of AUTOREV SRCREVs, which are the default for this recipe. -python () { - if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-dev": - raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-dev to enable it") -} - KBRANCH = "standard/base" KMETA = "kernel-meta" @@ -36,12 +28,14 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto-dev.git;branch=${KBRANCH};name SRCREV_machine ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' SRCREV_meta ?= '${@oe.utils.conditional("PREFERRED_PROVIDER_virtual/kernel", "linux-yocto-dev", "${AUTOREV}", "29594404d7fe73cd80eaa4ee8c43dcc53970c60e", d)}' -LINUX_VERSION ?= "4.6-rc+" +LINUX_VERSION ?= "4.8-rc+" LINUX_VERSION_EXTENSION ?= "-yoctodev-${LINUX_KERNEL_TYPE}" PV = "${LINUX_VERSION}+git${SRCPV}" COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64)" +KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" + # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb index a13895727..b95fb5857 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.1.bb @@ -2,13 +2,22 @@ KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "28d8cfdbcb18a6eef202099cca66430fd3b6eae0" -SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-rt": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "966ddde490030166010c5770f8f86cdd0e961c76" +SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.1.18" +LINUX_VERSION ?= "4.1.33" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb index d81ca1387..6c1138277 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.4.bb @@ -1,14 +1,23 @@ -KBRANCH ?= "standard/preempt-rt" +KBRANCH ?= "standard/preempt-rt/base" require recipes-kernel/linux/linux-yocto.inc -SRCREV_machine ?= "2bc112a6ccd16800a4c45e47ccb3018a1042abdf" -SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-rt": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "652b564985db555b549ef73405aea6c38919eefc" +SRCREV_meta ?= "3030330b066a33ce21164a8b30d0503cf9f68e5b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.4.3" +LINUX_VERSION ?= "4.4.26" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb new file mode 100644 index 000000000..e51c9cdcc --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-rt_4.8.bb @@ -0,0 +1,38 @@ +KBRANCH ?= "standard/preempt-rt/base" + +require recipes-kernel/linux/linux-yocto.inc + +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids errors when trying +# to build multiple virtual/kernel providers, e.g. as dependency of +# core-image-rt-sdk, core-image-rt. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != "linux-yocto-rt": + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") +} + +SRCREV_machine ?= "4057556c041f6aac0d29aa3425587d414c9a0090" +SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" + +LINUX_VERSION ?= "4.8.3" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +LINUX_KERNEL_TYPE = "preempt-rt" + +COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuppc|qemumips)" + +KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb index 28c72132a..ba01702cb 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.1.bb @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.1.18" +LINUX_VERSION ?= "4.1.33" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" +SRCREV_machine ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" +SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb index 684e88098..76c41639c 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.4.bb @@ -4,13 +4,13 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "4.4.3" +LINUX_VERSION ?= "4.4.26" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" +SRCREV_machine ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_meta ?= "3030330b066a33ce21164a8b30d0503cf9f68e5b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb new file mode 100644 index 000000000..c8ddbd93d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto-tiny_4.8.bb @@ -0,0 +1,25 @@ +KBRANCH ?= "standard/tiny/common-pc" +LINUX_KERNEL_TYPE = "tiny" +KCONFIG_MODE = "--allnoconfig" + +require recipes-kernel/linux/linux-yocto.inc + +LINUX_VERSION ?= "4.8.3" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;branch=${KBRANCH};name=machine \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" + +COMPATIBLE_MACHINE = "(qemux86$)" + +# Functionality flags +KERNEL_FEATURES = "" + +KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc index 6b161fc06..09cd1f178 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto.inc @@ -8,6 +8,15 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+\.\d+(\.\d+)*)" INC_PR = "r4" +# Skip processing of this recipe if it is not explicitly specified as the +# PREFERRED_PROVIDER for virtual/kernel. This avoids network access required +# by the use of AUTOREV SRCREVs, which are the default for this recipe. +python () { + if d.getVar("PREFERRED_PROVIDER_virtual/kernel", True) != d.getVar("PN", True): + d.delVar("BB_DONT_CACHE") + raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to %s to enable it" % (d.getVar("PN", True))) +} + DEPENDS += "xz-native bc-native" DEPENDS_append_aarch64 = " libgcc" KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" @@ -17,6 +26,8 @@ DEPENDS_append_nios2 = " libgcc" KERNEL_CC_append_nios2 = " ${TOOLCHAIN_OPTIONS}" KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}" +KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc" + # A KMACHINE is the mapping of a yocto $MACHINE to what is built # by the kernel. This is typically the branch that should be built, # and it can be specific to the machine or shared @@ -35,6 +46,7 @@ SRCREV_FORMAT ?= "meta_machine" # 2: report options that are not hardware related, but set by a BSP KCONF_AUDIT_LEVEL ?= "1" KCONF_BSP_AUDIT_LEVEL ?= "0" +KMETA_AUDIT ?= "yes" LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}" @@ -52,6 +64,7 @@ do_install_append(){ } # extra tasks -addtask kernel_link_vmlinux after do_compile before do_install +addtask kernel_version_sanity_check after do_kernel_metadata do_kernel_checkout before do_compile +addtask kernel_link_images after do_compile before do_strip addtask validate_branches before do_patch after do_kernel_checkout addtask kernel_configcheck after do_configure before do_compile diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb index aecb517ed..788a8eaaa 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.1.bb @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "232e2d88841c7e20857350275d80f5585ed93734" -SRCREV_machine_qemuarm64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_machine_qemumips ?= "7d3690c0762f11e038f14310a50ca1cdc813cc22" -SRCREV_machine_qemuppc ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_machine_qemux86 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_machine_qemux86-64 ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_machine_qemumips64 ?= "b71e4cd7d45f03048ad31e2a36dfe5a43f021b51" -SRCREV_machine ?= "91f62d4a0a31919d9b2ccdaf881130f99b61fc5e" -SRCREV_meta ?= "a4f88c3fad887e1c559d03ae1b531ca267137b69" +SRCREV_machine_qemuarm ?= "d67ef485ce1420df11bda2d9f6fb78ef50c1adff" +SRCREV_machine_qemuarm64 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" +SRCREV_machine_qemumips ?= "65116339cfd210990c9c4710cdfec3ebd59abb0e" +SRCREV_machine_qemuppc ?= "30816907653b57f1f3d5f9a7a2f6339bab14a680" +SRCREV_machine_qemux86 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" +SRCREV_machine_qemux86-64 ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" +SRCREV_machine_qemumips64 ?= "f7a0b532b6ac81757d85b0c9a928f45a87c9e364" +SRCREV_machine ?= "f4d0900b2851e829e990e0f64b09ed3b8e355fae" +SRCREV_meta ?= "3c3197e65b6f2f5514853c1fe78ae8ffc131b02c" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.1.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.1;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.1.18" +LINUX_VERSION ?= "4.1.33" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb index 3c5ee1bd4..e3a3d901d 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.4.bb @@ -11,20 +11,20 @@ KBRANCH_qemux86 ?= "standard/base" KBRANCH_qemux86-64 ?= "standard/base" KBRANCH_qemumips64 ?= "standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ec9167bcb0ccd4897177c5e235af68b5890aa326" -SRCREV_machine_qemuarm64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_machine_qemumips ?= "900f98d3ab6498bc7f4ff6b7a489db3bca4e6417" -SRCREV_machine_qemuppc ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_machine_qemux86 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_machine_qemux86-64 ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_machine_qemumips64 ?= "4b08dfb1fb3bc7659e8f3e13665597d9a9f0816d" -SRCREV_machine ?= "1a72cec834de2c80b5563f8afbeea7664fd5ee05" -SRCREV_meta ?= "bcc65090840f51a6ac937297be5c22fe268d01ab" +SRCREV_machine_qemuarm ?= "187bcc13f3023c3ae0a3ba5c69ae85c4e5e693ac" +SRCREV_machine_qemuarm64 ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_machine_qemumips ?= "2f273556495dd2871f08c73fc3f40d1ad546c638" +SRCREV_machine_qemuppc ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_machine_qemux86 ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_machine_qemux86-64 ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_machine_qemumips64 ?= "0a19cacf5738876666a4b530a9fa14f05b355299" +SRCREV_machine ?= "ca6a08bd7f86ebef11f763d26f787f7d65270473" +SRCREV_meta ?= "3030330b066a33ce21164a8b30d0503cf9f68e5b" SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.4.git;name=machine;branch=${KBRANCH}; \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "4.4.3" +LINUX_VERSION ?= "4.4.26" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.8.bb b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.8.bb new file mode 100644 index 000000000..13778b9c4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/linux/linux-yocto_4.8.bb @@ -0,0 +1,44 @@ +KBRANCH ?= "standard/base" + +require recipes-kernel/linux/linux-yocto.inc + +# board specific branches +KBRANCH_qemuarm ?= "standard/arm-versatile-926ejs" +KBRANCH_qemuarm64 ?= "standard/qemuarm64" +KBRANCH_qemumips ?= "standard/mti-malta32" +KBRANCH_qemuppc ?= "standard/qemuppc" +KBRANCH_qemux86 ?= "standard/base" +KBRANCH_qemux86-64 ?= "standard/base" +KBRANCH_qemumips64 ?= "standard/mti-malta64" + +SRCREV_machine_qemuarm ?= "4cc544ad09ad704322cb66fe4ba197a6a05dc71f" +SRCREV_machine_qemuarm64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_machine_qemumips ?= "c285969d4f9376a671167ecf397578c8ad3e6a75" +SRCREV_machine_qemuppc ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_machine_qemux86 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_machine_qemux86-64 ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_machine_qemumips64 ?= "64f96ba530e58456070f26b0f3fcce3f64988b72" +SRCREV_machine ?= "1adf9d36338dc3c63cdbf6f98bcbdc7bba42a794" +SRCREV_meta ?= "83110d94edeb856a3667b62903ed4ae91c24117d" + +SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.8.git;name=machine;branch=${KBRANCH}; \ + git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.8;destsuffix=${KMETA}" + +LINUX_VERSION ?= "4.8.3" + +PV = "${LINUX_VERSION}+git${SRCPV}" + +KMETA = "kernel-meta" +KCONF_BSP_AUDIT_LEVEL = "2" + +KERNEL_DEVICETREE_qemuarm = "versatile-pb.dtb" + +COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64" + +# Functionality flags +KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" +KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" +KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch deleted file mode 100644 index 3e2c4e1e6..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001 -From: Francis Giraldeau <francis.giraldeau@gmail.com> -Date: Mon, 15 Jun 2015 11:43:02 -0400 -Subject: [PATCH] Fix invalid pointer free with trace collection - -Upstream-Status: Submitted - -Patch proposed by Li RongQing related to bug# 790 - -Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> -Signed-off-by: Francis Giraldeau <francis.giraldeau@gmail.com> ---- - lib/context.c | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/lib/context.c b/lib/context.c -index 45aab34..8d3770f 100644 ---- a/lib/context.c -+++ b/lib/context.c -@@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, - struct bt_trace_descriptor *td; - struct bt_format *fmt; - struct bt_trace_handle *handle; -- int ret, closeret; -+ int ret; - - if (!ctx || !format_name || (!path && !stream_list)) - return -EINVAL; -@@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, - return handle->id; - - error: -- closeret = fmt->close_trace(td); -- if (closeret) { -- fprintf(stderr, "Error in close_trace callback\n"); -- } -+ if (handle) -+ bt_context_remove_trace(ctx, handle->id); - end: - return ret; - } --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch deleted file mode 100644 index eb16cd1d2..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace/0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8331b87845cafdda40e59a682f2ca8120ed0c472 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 31 Dec 2015 08:17:40 +0000 -Subject: [PATCH] lttng-live: Include sys/param.h for MAXNAMLEN defintion - -exposed on musl based systems - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: pending - - formats/lttng-live/lttng-live.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h -index 4ab641d..808ed2b 100644 ---- a/formats/lttng-live/lttng-live.h -+++ b/formats/lttng-live/lttng-live.h -@@ -25,6 +25,7 @@ - */ - - #include <stdint.h> -+#include <sys/param.h> - #include "lttng-viewer-abi.h" - - #define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344 --- -2.6.4 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.3.1.bb b/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.4.0.bb index 176602632..0fadeb0d7 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.3.1.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/babeltrace_1.4.0.bb @@ -10,15 +10,11 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native" inherit autotools pkgconfig -SRCREV = "6e2b9096c77138593097335b9b27202d98918089" - -SRC_URI = "git://git.efficios.com/babeltrace.git;branch=stable-1.3 \ - file://0001-Fix-invalid-pointer-free-with-trace-collection.patch \ - file://0001-lttng-live-Include-sys-param.h-for-MAXNAMLEN-definti.patch \ +SRC_URI = "http://www.efficios.com/files/babeltrace/babeltrace-${PV}.tar.bz2 \ " -S = "${WORKDIR}/git" +EXTRA_OECONF = "--disable-debug-info" + +SRC_URI[md5sum] = "fa99064048af5c9c6ff00e489ac809c2" +SRC_URI[sha256sum] = "9469eeb22617cd12668683b04c27003e5337e9ac66ade914988df3642fc0d0e4" -do_configure_prepend () { - ( cd ${S}; ${S}/bootstrap ) -} diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch new file mode 100644 index 000000000..6a91f3258 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules/Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch @@ -0,0 +1,49 @@ +From 1b0e574d680101105a6c1e8931c78824f5a97a42 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Mon, 5 Sep 2016 17:08:56 +0000 +Subject: [PATCH] Makefile: Do not fail if CONFIG_TRACEPOINTS is not enabled +Organization: O.S. Systems Software LTDA. + +The lttng-modules are being pulled by the tools-profile image feature, +however, not every kernel has the CONFIG_TRACEPOINTS feature enabled. + +This change makes the build do not fail when CONFIG_TRACEPOINTS is not +available, allowing it to be kept being pulled by default. + +Upstream-Status: Inapropriate [embedded specific] + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + Makefile | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 8602649..75550cc 100644 +--- a/Makefile ++++ b/Makefile +@@ -8,10 +8,7 @@ ifneq ($(KERNELRELEASE),) + # and defines the modules to be built. + + ifdef CONFIG_LOCALVERSION # Check if dot-config is included. +- ifeq ($(CONFIG_TRACEPOINTS),) +- $(error The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) +- endif # CONFIG_TRACEPOINTS +- endif # ifdef CONFIG_LOCALVERSION ++ ifneq ($(CONFIG_TRACEPOINTS),) + + TOP_LTTNG_MODULES_DIR := $(shell dirname $(lastword $(MAKEFILE_LIST))) + +@@ -94,6 +91,10 @@ ifneq ($(KERNELRELEASE),) + obj-$(CONFIG_LTTNG) += lib/ + obj-$(CONFIG_LTTNG) += tests/ + ++ else ++ $(warning The option CONFIG_TRACEPOINTS needs to be enabled in your kernel configuration) ++ endif # CONFIG_TRACEPOINTS ++ endif # ifdef CONFIG_LOCALVERSION + else # KERNELRELEASE + + # This part of the Makefile is used when the 'make' command is runned in the +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb index 2eb1a51bc..70145413a 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-modules_git.bb @@ -8,12 +8,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=362844633a08753bd96ab322a6c7f9f6 \ inherit module -SRCREV = "45e0ebd91f995cc73c2b0d5c60cf9d12e8c838bf" -PV = "2.7.1+git${SRCPV}" +SRCREV = "6e4fc6f36d68fb3c8d40113f8670eb6e9c8ffd76" +PV = "2.8.0+git${SRCPV}" COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|nios2|arm).*-linux' -SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.7" +SRC_URI = "git://git.lttng.org/lttng-modules.git;branch=stable-2.8 \ + file://Makefile-Do-not-fail-if-CONFIG_TRACEPOINTS-is-not-en.patch" export INSTALL_MOD_DIR="kernel/lttng-modules" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch new file mode 100644 index 000000000..6c8a9b211 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/0001-Fix-error.h-common-error.h.patch @@ -0,0 +1,33 @@ +From 6712db617fe9155ea236f6840c2bd18dbec4c871 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson <mjeanson@efficios.com> +Date: Wed, 15 Jun 2016 17:18:03 -0400 +Subject: [PATCH] Fix: error.h -> common/error.h +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Backport + +Signed-off-by: Michael Jeanson <mjeanson@efficios.com> +Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> +Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com> +--- + src/bin/lttng-sessiond/agent.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c +index 7cbbbde..310a7e8 100644 +--- a/src/bin/lttng-sessiond/agent.c ++++ b/src/bin/lttng-sessiond/agent.c +@@ -29,7 +29,7 @@ + #include "agent.h" + #include "ust-app.h" + #include "utils.h" +-#include "error.h" ++#include "common/error.h" + + #define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS) + +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch deleted file mode 100644 index d05c04c66..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/Revert-Build-look-for-python-3.0-when-building-pytho.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Fri, 4 Dec 2015 16:11:41 +0000 -Subject: [PATCH] Revert "Build: look for python >= 3.0 when building python bindings" -Organization: O.S. Systems Software LTDA. - -This reverts commit 227703a2ceada3c104edd56756d48455ca4c271a. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4dee4b4..6608bcd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -339,7 +339,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) - - if test "x${enable_python_binding:-yes}" = xyes; then - AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ]) -- AM_PATH_PYTHON([3.0]) -+ AM_PATH_PYTHON - - AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) - AC_ARG_VAR([PYTHON_CONFIG], [Path to python-config]) --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest index e758815c7..623006344 100755 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/run-ptest @@ -1,4 +1,5 @@ #!/bin/sh - -make -C tests installcheck - +# Without --ignore-exit, the tap harness causes any FAILs within a +# test plan to raise ERRORs; this is just noise. +makeargs="LOG_DRIVER_FLAGS=--ignore-exit" +make -t all >/dev/null 2>&1 && exec make -s $makeargs check 2>/dev/null diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch deleted file mode 100644 index 958bce48e..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/runtest-2.4.0.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index 584f59b..c2bcabd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -12,3 +12,9 @@ dist_doc_DATA = LICENSE \ - dist_noinst_DATA = CodingStyle - - EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt -+ -+install-ptest: -+ cp -r $(srcdir)/tests $(DESTDIR) -+ for m in $$(find $(DESTDIR)/tests -name Makefile); do \ -+ sed -i -e 's|^Makefile:|_Makefile:|' $$m; \ -+ done -diff --git a/tests/run.sh b/tests/run.sh -index c6c50fd..6455359 100755 ---- a/tests/run.sh -+++ b/tests/run.sh -@@ -19,4 +19,7 @@ - - [ -z "$1" ] && echo "Error: No testlist. Please specify a testlist to run." && exit 1 - --prove --merge --exec '' - < $1 -+prove --merge -v --exec '' - < $1 | sed \ -+ -e 's|^ok \(.*\)|PASS: \1|' \ -+ -e 's|^not ok \(.*\)|FAIL: \1|' \ -+ | egrep -h 'PASS|FAIL' diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch deleted file mode 100644 index bd4f7d1d1..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools/stop-using-SIGUNUSED.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1f54181c2df1fb92c3323a6dbf8273fb66b883b6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Galarneau?= - <jeremie.galarneau@efficios.com> -Date: Sat, 17 Oct 2015 19:41:47 -0400 -Subject: [PATCH] Port: Don't use SIGUNUSED which is not defined on Solaris -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Organization: O.S. Systems Software LTDA. - -Upstream-Status: Backport [2.8.0] - -Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com> ---- - src/common/runas.c | 18 +++++------------- - 1 file changed, 5 insertions(+), 13 deletions(-) - -diff --git a/src/common/runas.c b/src/common/runas.c -index 57f7382..0825470 100644 ---- a/src/common/runas.c -+++ b/src/common/runas.c -@@ -530,21 +530,13 @@ int run_as_rmdir_recursive(const char *path, uid_t uid, gid_t gid) - static - int reset_sighandler(void) - { -- int sig, ret = 0; -+ int sig; - -- for (sig = SIGHUP; sig <= SIGUNUSED; sig++) { -- /* Skip unblockable signals. */ -- if (sig == SIGKILL || sig == SIGSTOP) { -- continue; -- } -- if (signal(sig, SIG_DFL) == SIG_ERR) { -- PERROR("reset signal %d", sig); -- ret = -1; -- goto end; -- } -+ DBG("Resetting run_as worker signal handlers to default"); -+ for (sig = 1; sig <= 31; sig++) { -+ (void) signal(sig, SIG_DFL); - } --end: -- return ret; -+ return 0; - } - - static --- -2.6.2 - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb index 8bd09892c..bfc657b3a 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-tools_git.bb @@ -9,40 +9,41 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" -DEPENDS = "liburcu popt libxml2" +DEPENDS = "liburcu popt libxml2 util-linux" RDEPENDS_${PN} = "libgcc" -RDEPENDS_${PN}-ptest += "make perl bash" +RDEPENDS_${PN}-ptest += "make perl bash gawk ${PN} babeltrace procps" +# babelstats.pl wants getopt-long +RDEPENDS_${PN}-ptest += "perl-module-getopt-long" -SRCREV = "a90f2c1e10b759782653a81815625e9d1bbb75ca" -PV = "2.7.1+git${SRCPV}" +SRCREV = "d11e0dba0df9024b8613c51e167a379b91e8b20b" +PV = "2.8.1+git${SRCPV}" -PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ - am_cv_python_pythondir='${libdir}/python${PYTHON_BASEVERSION}/site-packages' \ - PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}' \ +PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ + am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ + PYTHON_INCLUDE='-I${STAGING_INCDIR}/python${PYTHON_BASEVERSION}${PYTHON_ABI}' \ " PACKAGECONFIG ??= "lttng-ust" -PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native" -PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust" +PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python3 swig-native" +PACKAGECONFIG[lttng-ust] = "--with-lttng-ust, --without-lttng-ust, lttng-ust" PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod" +PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native" PACKAGECONFIG_remove_libc-musl = "lttng-ust" -SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.7 \ - file://Revert-Build-look-for-python-3.0-when-building-pytho.patch \ - file://stop-using-SIGUNUSED.patch \ - file://runtest-2.4.0.patch \ +SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.8 \ + file://0001-Fix-error.h-common-error.h.patch \ file://run-ptest" S = "${WORKDIR}/git" -inherit autotools-brokensep ptest pkgconfig useradd +inherit autotools-brokensep ptest pkgconfig useradd python3-dir USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "tracing" FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ - ${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" -FILES_${PN}-staticdev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.a" -FILES_${PN}-dev += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*.la" + ${PYTHON_SITEPACKAGES_DIR}/*" +FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" +FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" # Since files are installed into ${libdir}/lttng/libexec we match # the libexec insane test so skip it. @@ -52,31 +53,64 @@ INSANE_SKIP_${PN}-dbg = "libexec" do_configure_prepend () { # Delete a shipped m4 file that overrides our patched one - rm -f ${S}/config/libxml.m4 + rm -f ${S}/m4/libxml.m4 } do_install_ptest () { - chmod +x ${D}${PTEST_PATH}/tests/utils/utils.sh - for i in `find ${D}${PTEST_PATH} -perm /u+x -type f`; do - sed -e "s:\$TESTDIR.*/src/bin/lttng/\$LTTNG_BIN:\$LTTNG_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/\$SESSIOND_BIN:\$SESSIOND_BIN:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$DIR/../src/bin/lttng-consumerd/:${libdir}/lttng/libexec/:g" \ - -e "s:\$TESTDIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-sessiond/lttng-sessiond:\$SESSIOND_BIN:g" \ - -e "s:\$DIR/../src/bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -e "s:\$DIR/../bin/lttng-relayd/\$RELAYD_BIN:\$RELAYD_BIN:g" \ - -i $i + mkdir -p ${D}${PTEST_PATH} + + cp -a -T ${B} ${D}${PTEST_PATH} + + # Prevent attempts to update Makefiles during test runs, and + # silence "Making check in $SUBDIR" messages. + find ${D}${PTEST_PATH} -name Makefile -type f -exec \ + sed -i -e 's!^Makefile:!_Makefile:!' \ + -e '/echo "Making $$target in $$subdir"; \\/d' {} + + + # Prevent attempts to update version.h during test runs. + sed -i -e '/^\.PHONY: version\.h$/d' ${D}${PTEST_PATH}/include/Makefile + + # Silence "Making check in $SUBDIR" messages. + find ${D}${PTEST_PATH} -name Makefile -type f -exec \ + sed -i -e '/echo "Making $$target in $$subdir"; \\/d' {} + + + # Substitute links to installed binaries. + for prog in lttng lttng-relayd lttng-sessiond lttng-consumerd ; do + orig="${D}${PTEST_PATH}/src/bin/${prog}/${prog}" + rm "$orig" + case "$prog" in + lttng-consumerd) + ln -s "${libdir}/lttng/libexec/$prog" "$orig" + ;; + *) + ln -s "${bindir}/$prog" "$orig" + ;; + esac done - # Update libdir references in copied .la files - for i in `find ${D}${PTEST_PATH} -type f -name *.la`; do - sed -i -e 's#${S}/tests/#${STAGING_DIR}${PTEST_PATH}#g' $i + # Remove libtool artifacts. + find ${D}${PTEST_PATH} \( -name '*.l[ao]' -o -name '*.lai' \) -delete + + # Remove object files and archives. + find ${D}${PTEST_PATH} -name '*.[oa]' -type f -delete + + # Remove Makefile.am and Makefile.in. + find ${D}${PTEST_PATH} -name 'Makefile.*' -type f -delete + + # Remove autom4te.cache. + rm -rf ${D}${PTEST_PATH}/autom4te.cache + + # Replace libtool wrapper scripts (which won't work on the + # target) with their corresponding binaries. + for prog in unit/ini_config/ini_config \ + regression/tools/live/live_test \ + regression/tools/health/health_check ; do + basename=${prog##*/} + ldir=${D}${PTEST_PATH}/tests/${prog%/*} + mv -f ${ldir}/.libs/${basename} ${ldir} done - sed -e "s:src/bin:bin:g" -e "s:lt-::g" \ - -i ${D}${PTEST_PATH}/tests/utils/utils.sh - sed -e "s:ini_config:\.libs\/ini_config:" \ - -i ${D}${PTEST_PATH}/tests/unit/ini_config/test_ini_config + # checkpatch.pl is unneeded on target and causes file-rdeps QA + # warnings. + rm -f ${D}${PTEST_PATH}/extras/checkpatch.pl } diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch deleted file mode 100644 index 9b37a4a33..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-add-support-for-aarch64_be.patch +++ /dev/null @@ -1,17 +0,0 @@ -lttng-ust: add support for aarch64_be - -Upstream-Status: Pending - -Signed-off-by: Tudor Florea <tudor.florea@enea.com> - -diff --ruN a/configure.ac b/configure.ac ---- a/configure.ac 2016-02-18 14:54:54.651713647 +0100 -+++ b/configure.ac 2016-02-18 14:56:11.057865297 +0100 -@@ -240,6 +240,7 @@ - s390x) NO_UNALIGNED_ACCESS=1 ;; - arm*) NO_UNALIGNED_ACCESS=1 ;; - aarch64) NO_UNALIGNED_ACCESS=1 ;; -+ aarch64_be) NO_UNALIGNED_ACCESS=1 ;; - mips*) NO_UNALIGNED_ACCESS=1 ;; - tile*) NO_UNALIGNED_ACCESS=1 ;; - *) diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch index b68a9899c..caf0b8bcf 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust/lttng-ust-doc-examples-disable.patch @@ -11,7 +11,7 @@ Index: doc/Makefile.am --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ --SUBDIRS = . examples +-SUBDIRS = . man examples +SUBDIRS = . dist_man_MANS = man/lttng-gen-tp.1 \ diff --git a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb index 15d925d29..baff71f58 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/lttng/lttng-ust_git.bb @@ -11,22 +11,30 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c963eb366b781252b0bf0fdf1624d9e9 \ inherit autotools lib_package DEPENDS = "liburcu util-linux" -RDEPENDS_${PN}-bin = "python-core" +RDEPENDS_${PN}-bin = "python3-core" # For backwards compatibility after rename RPROVIDES_${PN} = "lttng2-ust" RREPLACES_${PN} = "lttng2-ust" RCONFLICTS_${PN} = "lttng2-ust" -SRCREV = "f89c1a3cf2b06a4970b9154c00ff6409870aefb5" +SRCREV = "514a87f3b64181e384399935a5708a8f85b0cc83" PE = "2" -PV = "2.7.1+git${SRCPV}" +PV = "2.8.1+git${SRCPV}" -SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.7 \ +SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.8 \ file://lttng-ust-doc-examples-disable.patch \ - file://lttng-ust-add-support-for-aarch64_be.patch \ " +EXTRA_OECONF += "--disable-man-pages" + +do_install_append() { + # Patch python tools to use Python 3; they should be source compatible, but + # still refer to Python 2 in the shebang + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp +} + + S = "${WORKDIR}/git" do_configure_prepend () { diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc index cf3ad435c..96ef43dc3 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile.inc @@ -24,7 +24,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://oprofile-cross-compile-tests.patch \ file://run-ptest \ file://root-home-dir.patch \ - file://0001-Add-rmb-definition-for-NIOS2-architecture.patch" + file://0001-Add-rmb-definition-for-NIOS2-architecture.patch \ + file://0001-Fix-FTBFS-problem-with-GCC-6.patch \ +" SRC_URI_append_libc-musl = " file://musl.patch" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch new file mode 100644 index 000000000..d372fd527 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofile/0001-Fix-FTBFS-problem-with-GCC-6.patch @@ -0,0 +1,51 @@ +From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 +From: William Cohen <wcohen@redhat.com> +Date: Fri, 5 Feb 2016 17:30:19 -0500 +Subject: [PATCH] Fix FTBFS problem with GCC-6 + +GCC-6 is pickier about some of the type conversions causing the Fedora +24 mass rebuild the build of oprofile failed with: + +make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' +g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp +op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': +op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream<char>}' to 'const bool' in initialization + bool const verbose = cverb << (vbfd & vlevel1); + ^ +op_bfd.cpp:546:7: error: in argument to unary ! + if (!verbose) + ^~~~~~~ + +Avoid the intermediate bool type to make GCC-6 happy. + +Signed-off-by: William Cohen <wcohen@redhat.com> +--- +Upstream-Status: Backport + + libutil++/op_bfd.cpp | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp +index 389c920..f2eb42b 100644 +--- a/libutil++/op_bfd.cpp ++++ b/libutil++/op_bfd.cpp +@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, + { + op_bfd_symbol const & sym = syms[sym_idx]; + +- bool const verbose = cverb << (vbfd & vlevel1); +- + if (anon_obj) + start = sym.vma(); + else + start = sym.filepos(); + end = start + sym.size(); + +- if (!verbose) ++ if (!(cverb << (vbfd & vlevel1))) + return; + + io_state state(cverb << (vbfd & vlevel1)); +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/init b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/init deleted file mode 100755 index 2544ea4ac..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/init +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: oprofile-server -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OProfileUI server -# Description: -### END INIT INFO - -. /etc/init.d/functions - -case "$1" in - start) - echo "Starting OProfileUI server" - . /etc/profile - /usr/bin/oprofile-server & - ;; - - stop) - echo "Stopping OProfileUI server" - killproc oprofile-server - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service deleted file mode 100644 index 1a2cbe62e..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server/oprofileui-server.service +++ /dev/null @@ -1,6 +0,0 @@ -[Unit] -Description=OProfileUI Server -After=network.target - -[Service] -ExecStart=/bin/sh -c ". @SYSCONFDIR@/profile; @BINDIR@/oprofile-server" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server_git.bb deleted file mode 100644 index cc3477bc7..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui-server_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -require oprofileui.inc - -SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59" -PV = "0.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.yoctoproject.org/oprofileui \ - file://init \ - file://oprofileui-server.service " - -DEPENDS += "intltool-native gettext-native" - -EXTRA_OECONF += "--disable-client --enable-server" - -RDEPENDS_${PN} = "oprofile avahi-daemon" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/oprofileui-server - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/oprofileui-server.service ${D}${systemd_unitdir}/system/ - sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ - -e 's,@BINDIR@,${bindir},g' ${D}${systemd_unitdir}/system/oprofileui-server.service -} - -inherit update-rc.d systemd - -INITSCRIPT_NAME = "oprofileui-server" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." - -SYSTEMD_SERVICE_${PN} = "oprofileui-server.service" -SYSTEMD_AUTO_ENABLE = "disable" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui.inc b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui.inc deleted file mode 100644 index 8fcf014a9..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "User Interface for the System-Wide Profiler" -DESCRIPTION = "User interface for the OProfile tool" -HOMEPAGE = "http://labs.o-hand.com/oprofileui/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" - -SECTION = "x11" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "glib-2.0 avahi intltool-native" - -inherit autotools pkgconfig gettext - -EXTRA_OECONF = "--with-avahi" - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui_git.bb deleted file mode 100644 index 86f3d8e50..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/oprofile/oprofileui_git.bb +++ /dev/null @@ -1,20 +0,0 @@ -require oprofileui.inc - -DEPENDS += "gtk+ libglade libxml2 avahi-ui gconf gettext-native" - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -SRCREV = "389e1875af4721d52c7e65cf9cfffb69b0ed6a59" -PV = "0.0+git${SRCPV}" - -S = "${WORKDIR}/git" - -SRC_URI = "git://git.yoctoproject.org/oprofileui" - -EXTRA_OECONF += "--enable-client --disable-server" - -PACKAGES =+ "oprofileui-viewer" - -FILES_oprofileui-viewer = "${bindir}/oparchconv ${bindir}/oprofile-viewer ${datadir}/applications/ ${datadir}/oprofileui/ ${datadir}/icons" -RDEPENDS_oprofileui-viewer = "oprofile" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb b/import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb index 3d6ffb30f..471023d07 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/perf/perf.bb @@ -30,6 +30,8 @@ DEPENDS = " \ ${SCRIPTING_DEPENDS} \ ${LIBUNWIND_DEPENDS} \ bison flex xz \ + xmlto-native \ + asciidoc-native \ " do_configure[depends] += "virtual/kernel:do_shared_workdir" @@ -40,10 +42,6 @@ inherit linux-kernel-base kernel-arch pythonnative # needed for building the tools/perf Python bindings inherit python-dir -export STAGING_INCDIR -export STAGING_LIBDIR -export BUILD_SYS -export HOST_SYS export PYTHON_SITEPACKAGES_DIR #kernel 3.1+ supports WERROR to disable warnings as errors @@ -81,6 +79,7 @@ EXTRA_OEMAKE = '\ ARCH=${ARCH} \ CC="${CC}" \ AR="${AR}" \ + LD="${LD}" \ EXTRA_CFLAGS="-ldw" \ perfexecdir=${libexecdir} \ NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${LIBUNWIND_DEFINES} \ @@ -94,14 +93,12 @@ EXTRA_OEMAKE += "\ 'sharedir=${datadir}' \ 'sysconfdir=${sysconfdir}' \ 'perfexecdir=${libexecdir}/perf-core' \ - \ 'ETC_PERFCONFIG=${@os.path.relpath(sysconfdir, prefix)}' \ 'sharedir=${@os.path.relpath(datadir, prefix)}' \ 'mandir=${@os.path.relpath(mandir, prefix)}' \ 'infodir=${@os.path.relpath(infodir, prefix)}' \ " - do_compile() { # Linux kernel build system is expected to do the right thing unset CFLAGS @@ -136,11 +133,24 @@ do_configure_prepend () { # with each other if its in the shared source directory # if [ -e "${S}/tools/perf/config/Makefile" ]; then + perfconfig="${S}/tools/perf/config/Makefile" + fi + if [ -e "${S}/tools/perf/Makefile.config" ]; then + perfconfig="${S}/tools/perf/Makefile.config" + fi + if [ -n "${perfconfig}" ]; then # Match $(prefix)/$(lib) and $(prefix)/lib sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ - ${S}/tools/perf/config/Makefile + ${perfconfig} + fi + # The man pages installation is "$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)" + # in ${S}/tools/perf/Documentation/Makefile, if the mandir set to '?=', it + # will use the relative path 'share/man', in the way it will resulting in + # incorrect installation for man pages. + if [ -e "${S}/tools/perf/Documentation/Makefile" ]; then + sed -i 's,^mandir?=,mandir:=,' ${S}/tools/perf/Documentation/Makefile fi if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ @@ -160,10 +170,12 @@ do_configure_prepend () { if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/perf/Makefile.perf + sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/perf/Makefile.perf fi if [ -e "${S}/tools/lib/api/Makefile" ]; then sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/api/Makefile sed -i 's,AR = $(CROSS_COMPILE)ar,#AR,' ${S}/tools/lib/api/Makefile + sed -i 's,LD = $(CROSS_COMPILE)ld,#LD,' ${S}/tools/lib/api/Makefile fi if [ -e "${S}/tools/lib/subcmd/Makefile" ]; then sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/lib/subcmd/Makefile @@ -201,6 +213,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" RDEPENDS_${PN} += "elfutils bash" +RDEPENDS_${PN}-doc += "man" RDEPENDS_${PN}-archive =+ "bash" RDEPENDS_${PN}-python =+ "bash python python-modules" RDEPENDS_${PN}-perl =+ "bash perl perl-modules" @@ -209,10 +222,11 @@ RDEPENDS_${PN}-tests =+ "python" RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}" RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" +#FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core /usr/lib64/traceevent ${libdir}/traceevent" FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent" FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" -FILES_${PN}-python = "${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python" +FILES_${PN}-python = "${libdir}/perf/perf-core/scripts/python ${PYTHON_SITEPACKAGES_DIR}" FILES_${PN}-python += "${libexecdir}/perf-core/scripts/python/*" FILES_${PN}-perl = "${libdir}/perf/perf-core/scripts/perl" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch new file mode 100644 index 000000000..202f354d2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Avoid-building-docs.patch @@ -0,0 +1,42 @@ +From 27df521c68e7c8b5b050dab15f40aa15fd03623a Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 4 May 2016 14:58:24 +0300 +Subject: [PATCH] Avoid building docs + +Upstream-Status: Inappropriate +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + Makefile.am | 2 +- + m4/yelp.m4 | 6 ------ + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index b919a3f..3a3851d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,4 @@ +-SUBDIRS = daemon data help lib po src tools tests ++SUBDIRS = daemon data lib po src tools tests + + EXTRA_DIST = AUTHORS tap-test COPYING.gpl-2 + +diff --git a/m4/yelp.m4 b/m4/yelp.m4 +index 5db847f..1b6ede4 100644 +--- a/m4/yelp.m4 ++++ b/m4/yelp.m4 +@@ -27,12 +27,6 @@ AC_ARG_WITH([help-dir], + HELP_DIR="$with_help_dir" + AC_SUBST(HELP_DIR) + +-AC_ARG_VAR([ITSTOOL], [Path to the `itstool` command]) +-AC_CHECK_PROG([ITSTOOL], [itstool], [itstool]) +-if test x"$ITSTOOL" = x; then +- AC_MSG_ERROR([itstool not found]) +-fi +- + AC_ARG_VAR([XMLLINT], [Path to the `xmllint` command]) + AC_CHECK_PROG([XMLLINT], [xmllint], [xmllint]) + if test x"$XMLLINT" = x; then +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch new file mode 100644 index 000000000..608523272 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Disable-check-for-polkit-for-UI.patch @@ -0,0 +1,32 @@ +From 765d578145e31ddc9495adfab8037ade33c6a9cc Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 4 May 2016 10:59:36 +0300 +Subject: [PATCH] Disable check for polkit for UI + +The check is not technically required: sysprof just needs +to be able to access system perf counters at runtime. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 8559597..ecf93ad 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -131,8 +131,8 @@ AS_IF([test "$enable_gtk" = auto],[ + AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[enable_gtk=yes],[enable_gtk=no]) + ]) + AS_IF([test "$enable_gtk" = "yes"],[ +- AS_IF([test "$have_gtk" = "yes" && test "$have_polkit" = "yes"],[],[ +- AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version and polkit-gobject-1]) ++ AS_IF([test "$have_gtk" = "yes"],[],[ ++ AC_MSG_ERROR([--enable-gtk requires gtk+-3.0 >= gtk_required_version]) + ]) + ]) + AM_CONDITIONAL(ENABLE_GTK, test "$enable_gtk" = "yes") +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch new file mode 100644 index 000000000..92e804f98 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-Forward-port-mips-arm-memory-barrier-patches.patch @@ -0,0 +1,38 @@ +From a2d385e504323641b1127821833c61e77301c90b Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Sat, 11 Jun 2016 22:45:37 +0300 +Subject: [PATCH] Forward port mips & arm memory barrier patches + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + lib/util/util.h | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/lib/util/util.h b/lib/util/util.h +index 591722d..0768056 100644 +--- a/lib/util/util.h ++++ b/lib/util/util.h +@@ -29,4 +29,19 @@ + #define read_barrier() asm volatile("" ::: "memory") + #endif + ++#ifdef __arm__ ++/* ++ * Use the __kuser_memory_barrier helper in the CPU helper page. See ++ * arch/arm/kernel/entry-armv.S in the kernel source for details. ++ */ ++#define read_barrier() ((void(*)(void))0xffff0fa0)() ++#endif ++ ++#ifdef __mips__ ++#define read_barrier() asm volatile(".set mips2\n\t" \ ++ "sync\n\t" \ ++ ".set mips0" ::: "memory") ++#endif ++ ++ + #endif /* SP_UTIL_H */ +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch new file mode 100644 index 000000000..ac1384c9b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-callgraph-Use-U64_TO_POINTER.patch @@ -0,0 +1,29 @@ +From 05816e6f9cd65b2624bb04de65fdf61031c7017f Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Fri, 10 Jun 2016 14:01:54 +0300 +Subject: [PATCH] callgraph: Use U64_TO_POINTER + +This fixes a "cast to pointer from integer of different size" on i586. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Pending +--- + lib/sp-callgraph-view.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/sp-callgraph-view.c b/lib/sp-callgraph-view.c +index 02cc17b..58315b0 100644 +--- a/lib/sp-callgraph-view.c ++++ b/lib/sp-callgraph-view.c +@@ -135,7 +135,7 @@ build_functions_store (StackNode *node, + + gtk_list_store_append (state->store, &iter); + gtk_list_store_set (state->store, &iter, +- COLUMN_NAME, (const gchar *)node->data, ++ COLUMN_NAME, U64_TO_POINTER(node->data), + COLUMN_SELF, 100.0 * size / state->profile_size, + COLUMN_TOTAL, 100.0 * total / state->profile_size, + COLUMN_POINTER, node, +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch new file mode 100644 index 000000000..158d9975f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/0001-configure-Add-option-to-enable-disable-polkit.patch @@ -0,0 +1,41 @@ +From 2b4005d72d3393933a7914be102ea65505c536cc Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Thu, 21 Jul 2016 11:53:31 +0300 +Subject: [PATCH] configure: Add option to enable/disable polkit + +Changes the configure behaviour from autodetecting the polkit by default +to having an option to disable it explicitly + +Upstream-Status: Pending + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + configure.ac | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 2246d5a..3d3fe0f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,10 +104,18 @@ PKG_CHECK_MODULES(GTK, + [gtk+-3.0 >= gtk_required_version], + [have_gtk=yes], + [have_gtk=no]) ++AC_ARG_ENABLE([polkit], ++ AS_HELP_STRING([--disable-polkit], [Do not use Polkit]), ++ [enable_polkit="$enableval"], [enable_polkit="yes"]) ++ ++AS_IF([test "x$enable_polkit" = "xyes"], [ + PKG_CHECK_MODULES(POLKIT, + [polkit-gobject-1], + [have_polkit=yes], + [have_polkit=no]) ++ ]) ++AM_CONDITIONAL([HAVE_POLKIT], [test "x$enable_polkit" = "xyes"]) ++ + PKG_CHECK_MODULES(SYSTEMD, + [libsystemd >= systemd_required_version], + [have_systemd=yes], +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch index dcc2cbe67..f75ddad43 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/define-NT_GNU_BUILD_ID.patch @@ -7,8 +7,8 @@ Upstream-Status: Pending Index: git/elfparser.h =================================================================== ---- git.orig/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/elfparser.h 2011-07-16 20:28:54.733829895 -0700 +--- git.orig/lib/util/elfparser.h 2011-07-16 18:57:41.000000000 -0700 ++++ git/lib/util/elfparser.h 2011-07-16 20:28:54.733829895 -0700 @@ -17,6 +17,10 @@ */ #include <glib.h> diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/gui-argument.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/gui-argument.patch deleted file mode 100644 index d2c053e68..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/gui-argument.patch +++ /dev/null @@ -1,35 +0,0 @@ -Add the ability to explicitly enable/disable GUI support - -Signed-off-by: Christopher Larson <chris_larson@mentor.com> -Upstream-Status: Pending - ---- git.orig/configure.ac -+++ git/configure.ac -@@ -62,12 +62,24 @@ KMICRO=`uname -r | cut -d"." -f 3 | cut - # Pkgconfig dependencies - - core_dep="glib-2.0 >= 2.6.0" --gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0" - - PKG_CHECK_MODULES(CORE_DEP, $core_dep, [], AC_MSG_ERROR([sysprof dependencies not satisfied])) - --build_gui=yes --PKG_CHECK_MODULES(GUI_DEP, $gui_dep, [], build_gui=no) -+gui_dep="gtk+-2.0 > 2.6.0 gdk-pixbuf-2.0 pangoft2 libglade-2.0" -+ -+AC_ARG_ENABLE([gui], -+ [AS_HELP_STRING([--disable-gui], -+ [Disable GUI functionality (requires gtk+, gdk-pixbuf, pangoft2, libglade) @<:@default=auto@:>@])], -+ [], -+ [enable_gui=auto]) -+ -+build_gui=no -+AS_IF([test "x$enable_gui" != xno], -+ [PKG_CHECK_MODULES(GUI_DEP, $gui_dep, build_gui=yes, -+ [if test "x$enable_gui" != xauto; then -+ AC_MSG_FAILURE( -+ [--enable-gui was given, but gui dependencies were not satisfied]) -+ fi])]) - - AM_CONDITIONAL([BUILD_GUI], [test "$build_gui" = yes]) - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-arm.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-arm.patch deleted file mode 100644 index c53ac6427..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-arm.patch +++ /dev/null @@ -1,21 +0,0 @@ - -Upstream-Status: Pending - -Index: git/util.h -=================================================================== ---- git.orig/util.h 2010-12-07 22:41:57.156243001 -0600 -+++ git/util.h 2010-12-07 22:43:47.616243002 -0600 -@@ -37,4 +37,13 @@ - #define cpu_relax() asm volatile("" ::: "memory"); - #endif - -+#ifdef __arm__ -+/* -+ * Use the __kuser_memory_barrier helper in the CPU helper page. See -+ * arch/arm/kernel/entry-armv.S in the kernel source for details. -+ */ -+#define rmb() ((void(*)(void))0xffff0fa0)() -+#define cpu_relax() asm volatile("":::"memory") -+#endif -+ - #endif diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-mips.patch b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-mips.patch deleted file mode 100644 index e055b8ad8..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/files/rmb-mips.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Pending - -Index: git/util.h -=================================================================== ---- git.orig/util.h 2010-12-08 01:22:44.486243001 -0600 -+++ git/util.h 2010-12-08 01:23:27.836243001 -0600 -@@ -37,4 +37,15 @@ - #define cpu_relax() asm volatile("" ::: "memory"); - #endif - -+#ifdef __mips__ -+#define rmb() asm volatile( \ -+ ".set mips2\n\t" \ -+ "sync\n\t" \ -+ ".set mips0" \ -+ : /* no output */ \ -+ : /* no input */ \ -+ : "memory") -+#define cpu_relax() asm volatile("" ::: "memory") -+#endif -+ - #endif diff --git a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb index 84c6aad39..8d8b62639 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/sysprof/sysprof_git.bb @@ -1,31 +1,40 @@ SUMMARY = "System-wide Performance Profiler for Linux" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://src/sp-application.c;endline=17;md5=40e55577ef122c88fe20052acda64875" + +inherit gnomebase gettext systemd DEPENDS = "glib-2.0" -SRCREV = "cd44ee6644c3641507fb53b8a2a69137f2971219" -PV = "1.2.0+git${SRCPV}" +S = "${WORKDIR}/git" +SRCREV = "9c6cec9b49766bf77c1713bc5a7c6d651e628068" +PV = "3.20.0+git${SRCPV}" SRC_URI = "git://git.gnome.org/sysprof \ file://define-NT_GNU_BUILD_ID.patch \ - file://gui-argument.patch \ + file://0001-configure-Add-option-to-enable-disable-polkit.patch \ + file://0001-Disable-check-for-polkit-for-UI.patch \ + file://0001-Avoid-building-docs.patch \ + file://0001-callgraph-Use-U64_TO_POINTER.patch \ + file://0001-Forward-port-mips-arm-memory-barrier-patches.patch \ " +SRC_URI[archive.md5sum] = "d56e8492033b60e247634731e7f760b9" +SRC_URI[archive.sha256sum] = "4a338ad41bfffae87ef281f6e75c9660b3e0c6671bf5233be0c3f55a5e5b1ce5" -SRC_URI_append_arm = " file://rmb-arm.patch" -SRC_URI_append_armeb = " file://rmb-arm.patch" -SRC_URI_append_mips = " file://rmb-mips.patch" -SRC_URI_append_mips64 = " file://rmb-mips.patch" -SRC_URI_append_mips64n32 = " file://rmb-mips.patch" +AUTOTOOLS_AUXDIR = "${S}/build-aux" -S = "${WORKDIR}/git" +EXTRA_OECONF = "--enable-compile-warnings" -inherit autotools pkgconfig +PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" +PACKAGECONFIG[gtk] = "--enable-gtk,--disable-gtk,gtk+3" +PACKAGECONFIG[polkit] = "--enable-polkit,--disable-polkit,polkit dbus" -PACKAGECONFIG ?= "${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK2DISTROFEATURES}', 'gui', '', d)}" -PACKAGECONFIG[gui] = "--enable-gui,--disable-gui,gtk+ gdk-pixbuf pango libglade" +SOLIBS = ".so" +FILES_SOLIBSDEV = "" +FILES_${PN} += "${datadir}/icons/" + +SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'sysprof2.service', '', d)}" # We do not yet work for aarch64. -# COMPATIBLE_HOST = "^(?!aarch64).*" - diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb index 3686c2f76..46820ef48 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb @@ -13,8 +13,6 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" -EXTRA_OEMAKE = "" - # Compile and install the uprobes kernel module on machines with utrace # support. Note that staprun expects it in the systemtap/runtime directory, # not in /lib/modules. diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch deleted file mode 100644 index 33a89940a..000000000 --- a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/docproc-build-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> - -Index: git/doc/SystemTap_Tapset_Reference/Makefile.am -=================================================================== ---- git.orig/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 08:43:46.263339003 -0500 -+++ git/doc/SystemTap_Tapset_Reference/Makefile.am 2012-04-13 09:31:22.470083915 -0500 -@@ -27,6 +27,10 @@ - noinst_PROGRAMS = docproc - SRCTREE=$(abs_top_srcdir)/ - DOCPROC=$(abs_builddir)/docproc -+docproc_LINK = $(CC_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ -+ -+docproc.o: $(srcdir)/docproc.c -+ $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $(srcdir)/docproc.c - - all: $(PDFDOCS) stamp-htmldocs stamp-mandocs - tapsets.xml: docproc $(shell find $(SRCTREE)/tapset -name '*.stp') diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch new file mode 100644 index 000000000..7d43a79e2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap/monitor-option.patch @@ -0,0 +1,28 @@ +Add an option to explicitly disable the monitor (and therefore the dependency on +json-c and ncurses). + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/configure.ac b/configure.ac +index cd781a2..e56079a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -570,13 +574,16 @@ dnl See if we have enough libraries and tools to build the virt server + fi + AM_CONDITIONAL([BUILD_VIRT], [test "${have_libvirt}" == "yes" -a "${have_libxml2}" == "yes" -a "$enable_virt" != "no"]) + ++AC_ARG_ENABLE([monitor], AS_HELP_STRING([--disable-monitor],[Disable monitor])) ++if test "$enable_monitor" != "no"; then + dnl Check for presence of json-c and ncurses for use in monitor mode + PKG_CHECK_MODULES([jsonc], [json-c], [have_jsonc=yes], [have_jsonc=no]) + PKG_CHECK_MODULES([ncurses], [ncurses], [have_ncurses=yes], [have_ncurses=no]) +-AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes"]) + if test "${have_jsonc}" == "yes" -a "${have_ncurses}" == yes; then + AC_DEFINE([HAVE_MONITOR_LIBS],[1],[Define to 1 if json-c and ncurses libraries are installed]) + fi ++fi ++AM_CONDITIONAL([HAVE_MONITOR_LIBS], [test "${have_jsonc}" == "yes" -a "${have_ncurses}" == "yes" -a "$enable_monitor" != "no"]) + + AC_CACHE_CHECK([for assembler .section "?" flags support], stap_cv_sectionq, [ + old_CFLAGS="$CFLAGS" diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb index 97064b838..43bf69e87 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -2,17 +2,14 @@ SUMMARY = "Script-directed dynamic tracing and performance analysis tool for Lin require systemtap_git.inc -DEPENDS = "elfutils sqlite3 systemtap-native" -DEPENDS_class-native = "elfutils-native sqlite3-native gettext-native" -DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettext" +DEPENDS = "boost elfutils" -RDEPENDS_${PN} += "python bash" -RDEPENDS_${PN}_class-native += "python-native" -RDEPENDS_${PN}_class-nativesdk += "python-native" +RDEPENDS_${PN} += "python3-core bash" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ --without-nss --without-avahi --without-dyninst \ --disable-server --disable-grapher --enable-prologues \ + --with-python3 \ ac_cv_prog_have_javac=no \ ac_cv_prog_have_jar=no " @@ -20,8 +17,10 @@ STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs" EXTRA_OECONF += "${STAP_DOCS} " -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "sqlite monitor" PACKAGECONFIG[libvirt] = "--enable-libvirt,--disable-libvirt,libvirt" +PACKAGECONFIG[sqlite] = "--enable-sqlite,--disable-sqlite,sqlite3" +PACKAGECONFIG[monitor] = "--enable-monitor,--disable-monitor,ncurses json-c" inherit autotools gettext pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc index 656f15f80..304eb9975 100644 --- a/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/import-layers/yocto-poky/meta/recipes-kernel/systemtap/systemtap_git.inc @@ -1,14 +1,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "7009f2f782e52d6105fe68d6ea2a9820a1099c06" -PV = "2.9" +SRCREV = "616ec7a0b916df7785d911b824c3df6eb022b213" +PV = "3.0" SRC_URI = "git://sourceware.org/git/systemtap.git \ - file://docproc-build-fix.patch \ file://obsolete_automake_macros.patch \ file://system_map_location.patch \ file://configure-allow-to-disable-libvirt.patch \ file://x32_abi_time.patch \ + file://monitor-option.patch \ " # systemtap doesn't support mips |
