From 3232c56c01631953445429d1eb7ab532404d6271 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 14 Dec 2015 13:26:29 +0200 Subject: kbd: update to 2.0.3 0003-Only-inluclude-kernel-headers-with-glibc.patch is handling #include lines that are no longer present in the upstream source so it was dropped. Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- ...-Only-inluclude-kernel-headers-with-glibc.patch | 29 ----------------- meta/recipes-core/kbd/kbd_2.0.2.bb | 37 ---------------------- meta/recipes-core/kbd/kbd_2.0.3.bb | 36 +++++++++++++++++++++ 3 files changed, 36 insertions(+), 66 deletions(-) delete mode 100644 meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch delete mode 100644 meta/recipes-core/kbd/kbd_2.0.2.bb create mode 100644 meta/recipes-core/kbd/kbd_2.0.3.bb (limited to 'meta/recipes-core/kbd') diff --git a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch b/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch deleted file mode 100644 index 8bfcb0c7af..0000000000 --- a/meta/recipes-core/kbd/kbd/0003-Only-inluclude-kernel-headers-with-glibc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3c5c7acc7ef874b919b26583d3892e21b907833f Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Wed, 20 Aug 2014 09:00:03 +0200 -Subject: [PATCH 3/4] Only inluclude kernel headers with glibc - -This fixes compile errors with musl libc - -Signed-off-by: Natanael Copa -Upstream-Status: Pending ---- - src/resizecons.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/resizecons.c b/src/resizecons.c -index 5f84845..691dfcc 100644 ---- a/src/resizecons.c -+++ b/src/resizecons.c -@@ -80,7 +80,7 @@ - #include - #if (__GNU_LIBRARY__ >= 6) - #include --#else -+#elif defined(__GLIBC__) - #include - #include - #endif --- -2.1.0 - diff --git a/meta/recipes-core/kbd/kbd_2.0.2.bb b/meta/recipes-core/kbd/kbd_2.0.2.bb deleted file mode 100644 index 49bb6c9a3f..0000000000 --- a/meta/recipes-core/kbd/kbd_2.0.2.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Keytable files and keyboard utilities" -# everything minus console-fonts is GPLv2+ -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" -DEPENDS = "libcheck" - -inherit autotools gettext ptest pkgconfig - -RREPLACES_${PN} = "console-tools" -RPROVIDES_${PN} = "console-tools" -RCONFLICTS_${PN} = "console-tools" - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ - file://uclibc-stdarg.patch \ - file://0003-Only-inluclude-kernel-headers-with-glibc.patch \ - " - -SRC_URI[md5sum] = "87475eb78b1d6e6ab06686dd323ad4ba" -SRC_URI[sha256sum] = "9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912" - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" -PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," - -PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" - -FILES_${PN}-consolefonts = "${datadir}/consolefonts" -FILES_${PN}-consoletrans = "${datadir}/consoletrans" -FILES_${PN}-keymaps = "${datadir}/keymaps" -FILES_${PN}-unimaps = "${datadir}/unimaps" - -inherit update-alternatives - -ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt" -ALTERNATIVE_PRIORITY = "100" - -BBCLASSEXTEND = "native" -PARALLEL_MAKEINST = "" diff --git a/meta/recipes-core/kbd/kbd_2.0.3.bb b/meta/recipes-core/kbd/kbd_2.0.3.bb new file mode 100644 index 0000000000..746b68adee --- /dev/null +++ b/meta/recipes-core/kbd/kbd_2.0.3.bb @@ -0,0 +1,36 @@ +SUMMARY = "Keytable files and keyboard utilities" +# everything minus console-fonts is GPLv2+ +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=a5fcc36121d93e1f69d96a313078c8b5" +DEPENDS = "libcheck" + +inherit autotools gettext ptest pkgconfig + +RREPLACES_${PN} = "console-tools" +RPROVIDES_${PN} = "console-tools" +RCONFLICTS_${PN} = "console-tools" + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.xz \ + file://uclibc-stdarg.patch \ + " + +SRC_URI[md5sum] = "231b46e7142eb41ea3ae06d2ded3c208" +SRC_URI[sha256sum] = "7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e" + +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," + +PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" + +FILES_${PN}-consolefonts = "${datadir}/consolefonts" +FILES_${PN}-consoletrans = "${datadir}/consoletrans" +FILES_${PN}-keymaps = "${datadir}/keymaps" +FILES_${PN}-unimaps = "${datadir}/unimaps" + +inherit update-alternatives + +ALTERNATIVE_${PN} = "chvt deallocvt fgconsole openvt" +ALTERNATIVE_PRIORITY = "100" + +BBCLASSEXTEND = "native" +PARALLEL_MAKEINST = "" -- cgit 1.2.3-korg