From 1aa6b041f7682ebafcc7ac6ef168d7a60da5a683 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 13 Feb 2015 14:44:28 +0000 Subject: kexec-tools: 2.0.8 -> 2.0.9 Adjust the patch since it was partially applied upstream (in a different form) but not completely since the ppc specific part was not applied. (From OE-Core rev: d397ba39e6a5a7d42641d489917033c779816a1a) Signed-off-by: Richard Purdie --- ...kexec-tools-Refine-kdump-device_tree-sort.patch | 34 ---------------------- meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb | 19 ------------ meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb | 19 ++++++++++++ 3 files changed, 19 insertions(+), 53 deletions(-) delete mode 100644 meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb create mode 100644 meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb (limited to 'meta/recipes-kernel') diff --git a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch index ab1fe96..8bb4fc4 100644 --- a/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch +++ b/meta/recipes-kernel/kexec/kexec-tools/kexec-tools-Refine-kdump-device_tree-sort.patch @@ -46,37 +46,3 @@ index 4121c7d..cc04b04 100644 return strcmp(str1, str2); } -diff --git a/kexec/fs2dt.c b/kexec/fs2dt.c -index 5e6b98d..1c0345b 100644 ---- a/kexec/fs2dt.c -+++ b/kexec/fs2dt.c -@@ -475,6 +475,9 @@ static int comparefunc(const struct dirent **dentry1, - { - 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 -@@ -482,9 +485,13 @@ static int comparefunc(const struct dirent **dentry1, - * 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); - } --- -1.7.9.5 - diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb deleted file mode 100644 index c478732..0000000 --- a/meta/recipes-kernel/kexec/kexec-tools_2.0.8.bb +++ /dev/null @@ -1,19 +0,0 @@ -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 \ - file://kexec-aarch64.patch \ - " - -SRC_URI[md5sum] = "45bd2bc676ae202579e4c185563126af" -SRC_URI[sha256sum] = "95083c707577154a2241c5af0985f1eb3412d1ba208ef91813e9158b0a901179" - -PACKAGES =+ "kexec kdump vmcore-dmesg" - -ALLOW_EMPTY_${PN} = "1" -RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" - -FILES_kexec = "${sbindir}/kexec" -FILES_kdump = "${sbindir}/kdump" -FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb new file mode 100644 index 0000000..c0c2727 --- /dev/null +++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.9.bb @@ -0,0 +1,19 @@ +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 \ + file://kexec-aarch64.patch \ + " + +SRC_URI[md5sum] = "4ecb7ab7ad9eb6ce413899bdb07a8426" +SRC_URI[sha256sum] = "c2c6d204fe0911ebd304c40100163237feca4c5a854a2cca382ee36916a573d8" + +PACKAGES =+ "kexec kdump vmcore-dmesg" + +ALLOW_EMPTY_${PN} = "1" +RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" + +FILES_kexec = "${sbindir}/kexec" +FILES_kdump = "${sbindir}/kdump" +FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" -- cgit v1.1