mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
5f93bf9120
* 0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch was
applied upstream as 64667fe63ba9dd78adb9c4abf04bc3e4e25a0fd7
* 0005-common.h-replace-getline-with-fgets.patch was applied upstream as
38a6e3e29d90e11c3d5147e609d7b8e021b2cabf
* Updated all other patches due to patch fuzz
* ubihealthd fails to build with type mismatch errors, because it is not
used, it gets disabled.
```
In file included from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/sys/signalfd.h:22,
from ../sources/ubi-utils-klibc-2.0.2/ubi-utils/ubihealthd.c:16:
/build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/bits/types/sigset_t.h:7:20: error: conflicting types for 'sigse
t_t'; have '__sigset_t'
7 | typedef __sigset_t sigset_t;
| ^~~~~~~~
In file included from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/signal.h:14,
from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/sys/poll.h:10,
from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/poll.h:1,
from ../sources/ubi-utils-klibc-2.0.2/ubi-utils/ubihealthd.c:6:
/build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/arch/x86_64/klibc/archsignal.h:13:23: note: previous declaratio
n of 'sigset_t' with type 'sigset_t' {aka 'long unsigned int'}
13 | typedef unsigned long sigset_t;
| ^~~~~~~~
```
* add new package for ubiscan
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
53 lines
2.4 KiB
BlitzBasic
53 lines
2.4 KiB
BlitzBasic
SUMMARY = "UBI utils statically compiled against klibc"
|
|
DESCRIPTION = "Small sized tools from mtd-utils for use with initramfs."
|
|
SECTION = "base"
|
|
DEPENDS = "zlib e2fsprogs util-linux"
|
|
HOMEPAGE = "http://www.linux-mtd.infradead.org/"
|
|
LICENSE = "GPL-2.0-or-later"
|
|
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
|
|
file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c"
|
|
|
|
inherit autotools pkgconfig klibc
|
|
|
|
SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
|
|
SRC_URI = "git://git.infraroot.at/mtd-utils.git;protocol=https;branch=master \
|
|
file://0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch \
|
|
file://0003-Makefile.am-only-build-ubi-utils.patch \
|
|
file://0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch \
|
|
file://0001-make-Add-compiler-includes-in-cflags.patch \
|
|
"
|
|
|
|
# ubihealthd fails to build since 2.3.0
|
|
EXTRA_OECONF += "--without-tests --without-jffs --without-ubifs --disable-ubihealthd"
|
|
|
|
PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
|
|
PACKAGECONFIG[xattr] = ",,acl,"
|
|
PACKAGECONFIG[lzo] = "--with-lzo,--without-lzo,lzo"
|
|
|
|
EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} ${@bb.utils.contains('PACKAGECONFIG', 'xattr', '', '-DWITHOUT_XATTR', d)} -I${S}/include' 'BUILDDIR=${S}'"
|
|
|
|
do_install () {
|
|
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
|
|
}
|
|
|
|
PACKAGES = "ubi-utils-klibc-dbg ubi-utils-klibc-doc"
|
|
|
|
PACKAGES =+ "mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubidetach-klibc \
|
|
ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \
|
|
ubirmvol-klibc ubirsvol-klibc ubiscan-klibc ubiupdatevol-klibc"
|
|
|
|
FILES:mtdinfo-klibc = "${sbindir}/mtdinfo"
|
|
FILES:ubiattach-klibc = "${sbindir}/ubiattach"
|
|
FILES:ubiblock-klibc = "${sbindir}/ubiblock"
|
|
FILES:ubicrc32-klibc = "${sbindir}/ubicrc32"
|
|
FILES:ubidetach-klibc = "${sbindir}/ubidetach"
|
|
FILES:ubiformat-klibc = "${sbindir}/ubiformat"
|
|
FILES:ubimkvol-klibc = "${sbindir}/ubimkvol"
|
|
FILES:ubinfo-klibc = "${sbindir}/ubinfo"
|
|
FILES:ubinize-klibc = "${sbindir}/ubinize"
|
|
FILES:ubirename-klibc = "${sbindir}/ubirename"
|
|
FILES:ubirmvol-klibc = "${sbindir}/ubirmvol"
|
|
FILES:ubirsvol-klibc = "${sbindir}/ubirsvol"
|
|
FILES:ubiscan-klibc = "${sbindir}/ubiscan"
|
|
FILES:ubiupdatevol-klibc = "${sbindir}/ubiupdatevol"
|