Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On 11/15/21 01:59, Khem Raj wrote: On Sun, Nov 14, 2021 at 11:47 AM Jacob Kroon wrote: On 11/14/21 20:36, Richard Purdie wrote: On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: From: Alexander Kanavin This is not enabled or tested by default, and has never been ported to python 3 upstream[1], which means it doesn't work at all with plain poky. If you need it, please put it in a separate layer and/or modernize to work with py3. https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs Signed-off-by: Alexander Kanavin Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) What issue is it causing in hardknott? Normally we don't backport invasive changes like that... The problem is that mklibs-native doesn't build with gcc 11, and "image-mklibs" was in USER_CLASSES by default in hardknott. I sent a patch to fix mklibs build here: https://lists.openembedded.org/g/openembedded-core/message/151982 This fix is correct and it is trivial. We can apply it but after some discussions we just decided to drop mklibs support entirely with the proposed patch. Was there any other reason ? To have it successfully build (with mklibs actually enabled by putting your image in MKLIBS_OPTIMIZED_IMAGES) would require additional fixes, including updating mklibs to python3 I believe. /Jacob -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158275): https://lists.openembedded.org/g/openembedded-core/message/158275 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On Sun, Nov 14, 2021 at 11:47 AM Jacob Kroon wrote: > > On 11/14/21 20:36, Richard Purdie wrote: > > On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: > >> From: Alexander Kanavin > >> > >> This is not enabled or tested by default, and has never been > >> ported to python 3 upstream[1], which means it doesn't work at all > >> with plain poky. If you need it, please put it in a separate layer > >> and/or modernize to work with py3. > >> > >> https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs > >> > >> Signed-off-by: Alexander Kanavin > >> Signed-off-by: Jacob Kroon > >> Signed-off-by: Richard Purdie > >> (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) > > > > What issue is it causing in hardknott? Normally we don't backport invasive > > changes like that... > > > > The problem is that mklibs-native doesn't build with gcc 11, and > "image-mklibs" was in USER_CLASSES by default in hardknott. > > I sent a patch to fix mklibs build here: > > https://lists.openembedded.org/g/openembedded-core/message/151982 This fix is correct and it is trivial. We can apply it > > but after some discussions we just decided to drop mklibs support > entirely with the proposed patch. Was there any other reason ? > > /Jacob > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158272): https://lists.openembedded.org/g/openembedded-core/message/158272 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On 11/14/21 20:51, Richard Purdie wrote: On Sun, 2021-11-14 at 20:47 +0100, Jacob Kroon wrote: On 11/14/21 20:36, Richard Purdie wrote: On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: From: Alexander Kanavin This is not enabled or tested by default, and has never been ported to python 3 upstream[1], which means it doesn't work at all with plain poky. If you need it, please put it in a separate layer and/or modernize to work with py3. https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs Signed-off-by: Alexander Kanavin Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) What issue is it causing in hardknott? Normally we don't backport invasive changes like that... The problem is that mklibs-native doesn't build with gcc 11, and "image-mklibs" was in USER_CLASSES by default in hardknott. I sent a patch to fix mklibs build here: https://lists.openembedded.org/g/openembedded-core/message/151982 but after some discussions we just decided to drop mklibs support entirely with the proposed patch. ok, that is something we should fix. My worry is that the backport as is will need everyone to update their local.conf since the class will no longer be there and it will throw errors if people try and include it. This isn't what people expect from a point release. Could we just remove it from local.conf in hardknott? That should solve the issue but reduce risk to anyone who has hardknott already working fine with an older gcc. Yeah I'm ok with that, I'm even ok with leaving it as it is :-) Or perhaps we should forward-port ef8b7946b4793db653ef7dd716e1d3f919a84725 in dunfell branch to hardknott, which also should take care of it. /Jacob -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158265): https://lists.openembedded.org/g/openembedded-core/message/158265 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On Sun, 2021-11-14 at 20:47 +0100, Jacob Kroon wrote: > On 11/14/21 20:36, Richard Purdie wrote: > > On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: > > > From: Alexander Kanavin > > > > > > This is not enabled or tested by default, and has never been > > > ported to python 3 upstream[1], which means it doesn't work at all > > > with plain poky. If you need it, please put it in a separate layer > > > and/or modernize to work with py3. > > > > > > https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs > > > > > > Signed-off-by: Alexander Kanavin > > > Signed-off-by: Jacob Kroon > > > Signed-off-by: Richard Purdie > > > (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) > > > > What issue is it causing in hardknott? Normally we don't backport invasive > > changes like that... > > > > The problem is that mklibs-native doesn't build with gcc 11, and > "image-mklibs" was in USER_CLASSES by default in hardknott. > > I sent a patch to fix mklibs build here: > > https://lists.openembedded.org/g/openembedded-core/message/151982 > > but after some discussions we just decided to drop mklibs support > entirely with the proposed patch. ok, that is something we should fix. My worry is that the backport as is will need everyone to update their local.conf since the class will no longer be there and it will throw errors if people try and include it. This isn't what people expect from a point release. Could we just remove it from local.conf in hardknott? That should solve the issue but reduce risk to anyone who has hardknott already working fine with an older gcc. Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158264): https://lists.openembedded.org/g/openembedded-core/message/158264 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On 11/14/21 20:36, Richard Purdie wrote: On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: From: Alexander Kanavin This is not enabled or tested by default, and has never been ported to python 3 upstream[1], which means it doesn't work at all with plain poky. If you need it, please put it in a separate layer and/or modernize to work with py3. https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs Signed-off-by: Alexander Kanavin Signed-off-by: Jacob Kroon Signed-off-by: Richard Purdie (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) What issue is it causing in hardknott? Normally we don't backport invasive changes like that... The problem is that mklibs-native doesn't build with gcc 11, and "image-mklibs" was in USER_CLASSES by default in hardknott. I sent a patch to fix mklibs build here: https://lists.openembedded.org/g/openembedded-core/message/151982 but after some discussions we just decided to drop mklibs support entirely with the proposed patch. /Jacob -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158263): https://lists.openembedded.org/g/openembedded-core/message/158263 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
On Sun, 2021-11-14 at 07:50 +0100, Jacob Kroon wrote: > From: Alexander Kanavin > > This is not enabled or tested by default, and has never been > ported to python 3 upstream[1], which means it doesn't work at all > with plain poky. If you need it, please put it in a separate layer > and/or modernize to work with py3. > > https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs > > Signed-off-by: Alexander Kanavin > Signed-off-by: Jacob Kroon > Signed-off-by: Richard Purdie > (cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354) What issue is it causing in hardknott? Normally we don't backport invasive changes like that... Cheers, Richard -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158262): https://lists.openembedded.org/g/openembedded-core/message/158262 Mute This Topic: https://lists.openembedded.org/mt/87042685/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[OE-core] [hardknott][PATCH] mklibs: remove recipes and class
From: Alexander Kanavin
This is not enabled or tested by default, and has never been
ported to python 3 upstream[1], which means it doesn't work at all
with plain poky. If you need it, please put it in a separate layer
and/or modernize to work with py3.
https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs
Signed-off-by: Alexander Kanavin
Signed-off-by: Jacob Kroon
Signed-off-by: Richard Purdie
(cherry picked from commit 908df863b419d1cad7317153101fc827e7e3a354)
---
meta/classes/image-mklibs.bbclass | 56 --
meta/conf/distro/include/maintainers.inc | 1 -
meta/conf/local.conf.sample | 5 +-
meta/conf/local.conf.sample.extended | 9 --
.../mklibs/files/ac_init_fix.patch| 19
...re-on-symbol-provided-by-application.patch | 103 --
.../mklibs/files/fix_STT_GNU_IFUNC.patch | 26 -
.../mklibs/files/fix_cross_compile.patch | 81 --
...U-unique-symbols-as-provided-symbols.patch | 34 --
.../mklibs/files/sysrooted-ldso.patch | 18 ---
.../mklibs/mklibs-native_0.1.44.bb| 22
11 files changed, 1 insertion(+), 373 deletions(-)
delete mode 100644 meta/classes/image-mklibs.bbclass
delete mode 100644 meta/recipes-devtools/mklibs/files/ac_init_fix.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
delete mode 100644 meta/recipes-devtools/mklibs/mklibs-native_0.1.44.bb
diff --git a/meta/classes/image-mklibs.bbclass
b/meta/classes/image-mklibs.bbclass
deleted file mode 100644
index 68e11d4365..00
--- a/meta/classes/image-mklibs.bbclass
+++ /dev/null
@@ -1,56 +0,0 @@
-do_rootfs[depends] += "mklibs-native:do_populate_sysroot"
-
-IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
-
-inherit linuxloader
-
-mklibs_optimize_image_doit() {
- rm -rf ${WORKDIR}/mklibs
- mkdir -p ${WORKDIR}/mklibs/dest
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.before.mklibs.txt
-
- # Build a list of dynamically linked executable ELF files.
- # Omit libc/libpthread as a special case because it has an interpreter
- # but is primarily what we intend to strip down.
- for i in `find . -type f -executable ! -name 'libc-*' ! -name
'libpthread-*'`; do
- file $i | grep -q ELF || continue
- ${HOST_PREFIX}readelf -l $i | grep -q INTERP || continue
- echo $i
- done > ${WORKDIR}/mklibs/executables.list
-
- dynamic_loader=${@get_linuxloader(d)}
-
- mklibs -v \
- --ldlib ${dynamic_loader} \
- --libdir ${baselib} \
- --sysroot ${PKG_CONFIG_SYSROOT_DIR} \
- --gcc-options "--sysroot=${PKG_CONFIG_SYSROOT_DIR}" \
- --root ${IMAGE_ROOTFS} \
- --target `echo ${TARGET_PREFIX} | sed 's/-$//' ` \
- -d ${WORKDIR}/mklibs/dest \
- `cat ${WORKDIR}/mklibs/executables.list`
-
- cd ${WORKDIR}/mklibs/dest
- for i in *
- do
- cp $i `find ${IMAGE_ROOTFS} -name $i`
- done
-
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.after.mklibs.txt
-
- echo rootfs size before mklibs optimization: `cat
${WORKDIR}/mklibs/du.before.mklibs.txt`
- echo rootfs size after mklibs optimization: `cat
${WORKDIR}/mklibs/du.after.mklibs.txt`
-}
-
-mklibs_optimize_image() {
- for img in ${MKLIBS_OPTIMIZED_IMAGES}
- do
- if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
- then
- mklibs_optimize_image_doit
- break
- fi
- done
-}
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 5d453a6fcd..543c6438f5 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -502,7 +502,6 @@ RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao
"
RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster "
RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster "
-RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang "
RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin
"
RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao "
diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample
index 870509cf1f..07b3d13951 100644
--- a/meta/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
@@ -126,11 +126,8 @@ EXTRA_IMAGE_FEATURES ?=
Re: [OE-core] [hardknott][PATCH] mklibs: remove recipes and class
mklibs-native-0.1.44 do_compile failed on Fedora34:
mklibs-readelf/elf.hpp:52:56: error: ISO C++17 does not allow dynamic
exception specifications
so removed it.
On 7/28/21 10:54 AM, Changqing Li wrote:
From: Alexander Kanavin
This is not enabled or tested by default, and has never been
ported to python 3 upstream[1], which means it doesn't work at all
with plain poky. If you need it, please put it in a separate layer
and/or modernize to work with py3.
https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs
(From OE-Core rev: 908df863b419d1cad7317153101fc827e7e3a354)
Signed-off-by: Alexander Kanavin
Signed-off-by: Jacob Kroon
Signed-off-by: Richard Purdie
---
meta/classes/image-mklibs.bbclass | 56 --
meta/conf/distro/include/maintainers.inc | 1 -
.../mklibs/files/ac_init_fix.patch| 19
...re-on-symbol-provided-by-application.patch | 103 --
.../mklibs/files/fix_STT_GNU_IFUNC.patch | 26 -
.../mklibs/files/fix_cross_compile.patch | 81 --
...U-unique-symbols-as-provided-symbols.patch | 34 --
.../mklibs/files/sysrooted-ldso.patch | 18 ---
.../mklibs/mklibs-native_0.1.44.bb| 22
9 files changed, 360 deletions(-)
delete mode 100644 meta/classes/image-mklibs.bbclass
delete mode 100644 meta/recipes-devtools/mklibs/files/ac_init_fix.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
delete mode 100644 meta/recipes-devtools/mklibs/mklibs-native_0.1.44.bb
diff --git a/meta/classes/image-mklibs.bbclass
b/meta/classes/image-mklibs.bbclass
deleted file mode 100644
index 68e11d4365..00
--- a/meta/classes/image-mklibs.bbclass
+++ /dev/null
@@ -1,56 +0,0 @@
-do_rootfs[depends] += "mklibs-native:do_populate_sysroot"
-
-IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
-
-inherit linuxloader
-
-mklibs_optimize_image_doit() {
- rm -rf ${WORKDIR}/mklibs
- mkdir -p ${WORKDIR}/mklibs/dest
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.before.mklibs.txt
-
- # Build a list of dynamically linked executable ELF files.
- # Omit libc/libpthread as a special case because it has an interpreter
- # but is primarily what we intend to strip down.
- for i in `find . -type f -executable ! -name 'libc-*' ! -name
'libpthread-*'`; do
- file $i | grep -q ELF || continue
- ${HOST_PREFIX}readelf -l $i | grep -q INTERP || continue
- echo $i
- done > ${WORKDIR}/mklibs/executables.list
-
- dynamic_loader=${@get_linuxloader(d)}
-
- mklibs -v \
- --ldlib ${dynamic_loader} \
- --libdir ${baselib} \
- --sysroot ${PKG_CONFIG_SYSROOT_DIR} \
- --gcc-options "--sysroot=${PKG_CONFIG_SYSROOT_DIR}" \
- --root ${IMAGE_ROOTFS} \
- --target `echo ${TARGET_PREFIX} | sed 's/-$//' ` \
- -d ${WORKDIR}/mklibs/dest \
- `cat ${WORKDIR}/mklibs/executables.list`
-
- cd ${WORKDIR}/mklibs/dest
- for i in *
- do
- cp $i `find ${IMAGE_ROOTFS} -name $i`
- done
-
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.after.mklibs.txt
-
- echo rootfs size before mklibs optimization: `cat
${WORKDIR}/mklibs/du.before.mklibs.txt`
- echo rootfs size after mklibs optimization: `cat
${WORKDIR}/mklibs/du.after.mklibs.txt`
-}
-
-mklibs_optimize_image() {
- for img in ${MKLIBS_OPTIMIZED_IMAGES}
- do
- if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
- then
- mklibs_optimize_image_doit
- break
- fi
- done
-}
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 6276331857..22f873444a 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -502,7 +502,6 @@ RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao
"
RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster "
RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster "
-RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang "
RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin
"
RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao "
diff --git a/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
b/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
deleted file
[OE-core] [hardknott][PATCH] mklibs: remove recipes and class
From: Alexander Kanavin
This is not enabled or tested by default, and has never been
ported to python 3 upstream[1], which means it doesn't work at all
with plain poky. If you need it, please put it in a separate layer
and/or modernize to work with py3.
https://salsa.debian.org/installer-team/mklibs/-/blob/master/src/mklibs
(From OE-Core rev: 908df863b419d1cad7317153101fc827e7e3a354)
Signed-off-by: Alexander Kanavin
Signed-off-by: Jacob Kroon
Signed-off-by: Richard Purdie
---
meta/classes/image-mklibs.bbclass | 56 --
meta/conf/distro/include/maintainers.inc | 1 -
.../mklibs/files/ac_init_fix.patch| 19
...re-on-symbol-provided-by-application.patch | 103 --
.../mklibs/files/fix_STT_GNU_IFUNC.patch | 26 -
.../mklibs/files/fix_cross_compile.patch | 81 --
...U-unique-symbols-as-provided-symbols.patch | 34 --
.../mklibs/files/sysrooted-ldso.patch | 18 ---
.../mklibs/mklibs-native_0.1.44.bb| 22
9 files changed, 360 deletions(-)
delete mode 100644 meta/classes/image-mklibs.bbclass
delete mode 100644 meta/recipes-devtools/mklibs/files/ac_init_fix.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/avoid-failure-on-symbol-provided-by-application.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_STT_GNU_IFUNC.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/fix_cross_compile.patch
delete mode 100644
meta/recipes-devtools/mklibs/files/show-GNU-unique-symbols-as-provided-symbols.patch
delete mode 100644 meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
delete mode 100644 meta/recipes-devtools/mklibs/mklibs-native_0.1.44.bb
diff --git a/meta/classes/image-mklibs.bbclass
b/meta/classes/image-mklibs.bbclass
deleted file mode 100644
index 68e11d4365..00
--- a/meta/classes/image-mklibs.bbclass
+++ /dev/null
@@ -1,56 +0,0 @@
-do_rootfs[depends] += "mklibs-native:do_populate_sysroot"
-
-IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; "
-
-inherit linuxloader
-
-mklibs_optimize_image_doit() {
- rm -rf ${WORKDIR}/mklibs
- mkdir -p ${WORKDIR}/mklibs/dest
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.before.mklibs.txt
-
- # Build a list of dynamically linked executable ELF files.
- # Omit libc/libpthread as a special case because it has an interpreter
- # but is primarily what we intend to strip down.
- for i in `find . -type f -executable ! -name 'libc-*' ! -name
'libpthread-*'`; do
- file $i | grep -q ELF || continue
- ${HOST_PREFIX}readelf -l $i | grep -q INTERP || continue
- echo $i
- done > ${WORKDIR}/mklibs/executables.list
-
- dynamic_loader=${@get_linuxloader(d)}
-
- mklibs -v \
- --ldlib ${dynamic_loader} \
- --libdir ${baselib} \
- --sysroot ${PKG_CONFIG_SYSROOT_DIR} \
- --gcc-options "--sysroot=${PKG_CONFIG_SYSROOT_DIR}" \
- --root ${IMAGE_ROOTFS} \
- --target `echo ${TARGET_PREFIX} | sed 's/-$//' ` \
- -d ${WORKDIR}/mklibs/dest \
- `cat ${WORKDIR}/mklibs/executables.list`
-
- cd ${WORKDIR}/mklibs/dest
- for i in *
- do
- cp $i `find ${IMAGE_ROOTFS} -name $i`
- done
-
- cd ${IMAGE_ROOTFS}
- du -bs > ${WORKDIR}/mklibs/du.after.mklibs.txt
-
- echo rootfs size before mklibs optimization: `cat
${WORKDIR}/mklibs/du.before.mklibs.txt`
- echo rootfs size after mklibs optimization: `cat
${WORKDIR}/mklibs/du.after.mklibs.txt`
-}
-
-mklibs_optimize_image() {
- for img in ${MKLIBS_OPTIMIZED_IMAGES}
- do
- if [ "${img}" = "${PN}" ] || [ "${img}" = "all" ]
- then
- mklibs_optimize_image_doit
- break
- fi
- done
-}
diff --git a/meta/conf/distro/include/maintainers.inc
b/meta/conf/distro/include/maintainers.inc
index 6276331857..22f873444a 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -502,7 +502,6 @@ RECIPE_MAINTAINER_pn-mingetty = "Yi Zhao
"
RECIPE_MAINTAINER_pn-mini-x-session = "Armin Kuster "
RECIPE_MAINTAINER_pn-minicom = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mkfontscale = "Armin Kuster "
-RECIPE_MAINTAINER_pn-mklibs-native = "Robert Yang "
RECIPE_MAINTAINER_pn-mmc-utils = "Anuj Mittal "
RECIPE_MAINTAINER_pn-mobile-broadband-provider-info = "Alexander Kanavin
"
RECIPE_MAINTAINER_pn-modutils-initscripts = "Yi Zhao "
diff --git a/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
b/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
deleted file mode 100644
index 422af10420..00
--- a/meta/recipes-devtools/mklibs/files/ac_init_fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Get the version of mklibs by simpler means. The MKLIBS_VERSION string in the
-configure.ac file is
