commit: a1fcc973826f9827c86af2608782a32fa394b15a Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Sep 16 18:17:54 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Sep 16 18:17:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1fcc973
dev-embedded/kobs-ng: Port to EAPI 7 Closes: https://bugs.gentoo.org/722634 Closes: https://bugs.gentoo.org/742188 Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: David Seifert <soap <AT> gentoo.org> .../kobs-ng/files/kobs-ng-fix-stdint.patch | 93 ++++++++++++++++++++++ dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild | 22 +++-- 2 files changed, 103 insertions(+), 12 deletions(-) diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch new file mode 100644 index 00000000000..d323da1d09e --- /dev/null +++ b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch @@ -0,0 +1,93 @@ +--- a/src/BootControlBlocks.h ++++ b/src/BootControlBlocks.h +@@ -20,6 +20,8 @@ + #ifndef BOOTCONTROLBLOCKS_H_ + #define BOOTCONTROLBLOCKS_H_ + ++#include <stdint.h> ++ + #define NCB_FINGERPRINT1 0x504d5453 //!< 'STMP' + #define NCB_FINGERPRINT2 0x2042434e //!< 'NCB<space>' - NAND Control Block + #define NCB_FINGERPRINT3 0x4e494252 //!< 'RBIN' - ROM Boot Image Block - N +--- a/src/bootstream.c ++++ b/src/bootstream.c +@@ -30,6 +30,7 @@ + #include <time.h> + #include <alloca.h> + #include <stddef.h> ++#include <stdint.h> + + #include "config.h" + #include "mtd.h" +--- a/src/dcp_bootstream_ioctl.h ++++ b/src/dcp_bootstream_ioctl.h +@@ -20,6 +20,8 @@ + #ifndef DCP_BOOTSTREAM_IOCTL_H + #define DCP_BOOTSTREAM_IOCTL_H + ++#include <stdint.h> ++ + /* remember to have included the proper _IO definition + * file before hand. + * For user space it's <sys/ioctl.h> +--- a/src/mtd.c ++++ b/src/mtd.c +@@ -24,6 +24,7 @@ + + #define _GNU_SOURCE + #include <stdio.h> ++#include <stdint.h> + #include <malloc.h> + #include <unistd.h> + #include <stdlib.h> +--- a/src/mtd.h ++++ b/src/mtd.h +@@ -25,6 +25,8 @@ + #ifndef MTD_H + #define MTD_H + ++#include <stdint.h> ++ + #include <mtd/mtd-user.h> + #include <endian.h> + +--- a/src/ncb.c ++++ b/src/ncb.c +@@ -25,6 +25,7 @@ + #include <string.h> + #include <assert.h> + #include <errno.h> ++#include <stdint.h> + + #include "mtd.h" + #include "config.h" +--- a/src/plat_boot_config.h ++++ b/src/plat_boot_config.h +@@ -23,6 +23,7 @@ + + #include <stdio.h> + #include <stdlib.h> ++#include <stdint.h> + + #include "mtd.h" + +--- a/src/rom_nand_hamming_code_ecc.c ++++ b/src/rom_nand_hamming_code_ecc.c +@@ -32,6 +32,7 @@ + // Includes and external references + //////////////////////////////////////////////////////////////////////////////// + ++#include <stdint.h> + #include <string.h> + + #include "rom_nand_hamming_code_ecc.h" +--- a/src/sha1.c ++++ b/src/sha1.c +@@ -23,6 +23,7 @@ + * SUCH DAMAGE. + */ + ++#include <stdint.h> + #include <string.h> + + #include "sha.h" diff --git a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild index fa662e6a10e..0b1be343297 100644 --- a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild +++ b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild @@ -1,26 +1,24 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="4" +EAPI=7 -inherit eutils versionator - -MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-)" +MY_PV="$(ver_cut 1-3)-$(ver_cut 4-)" MY_P="${PN}-${MY_PV}" -DESCRIPTION="utility to write u-boot images to NAND on Freescale iMX devices" +DESCRIPTION="Utility to write u-boot images to NAND on Freescale iMX devices" HOMEPAGE="http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW"; SRC_URI="http://storage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"; LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="" S="${WORKDIR}/${MY_P}" -src_prepare() { - epatch "${FILESDIR}"/kobs-ng-fix-mtd-defines.patch - epatch "${FILESDIR}"/kobs-ng-fix-open-without-mode.patch - epatch "${FILESDIR}"/kobs-ng-fix-array-violation.patch -} +PATCHES=( + "${FILESDIR}"/${PN}-fix-mtd-defines.patch + "${FILESDIR}"/${PN}-fix-open-without-mode.patch + "${FILESDIR}"/${PN}-fix-array-violation.patch + "${FILESDIR}"/${PN}-fix-stdint.patch +)
