Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-embedded/kobs-ng/files/, dev-embedded/kobs-ng/
Date: Wed, 16 Sep 2020 18:19:24
Message-Id: 1600280274.a1fcc973826f9827c86af2608782a32fa394b15a.soap@gentoo
1 commit: a1fcc973826f9827c86af2608782a32fa394b15a
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 16 18:17:54 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 16 18:17:54 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1fcc973
7
8 dev-embedded/kobs-ng: Port to EAPI 7
9
10 Closes: https://bugs.gentoo.org/722634
11 Closes: https://bugs.gentoo.org/742188
12 Package-Manager: Portage-3.0.7, Repoman-3.0.1
13 Signed-off-by: David Seifert <soap <AT> gentoo.org>
14
15 .../kobs-ng/files/kobs-ng-fix-stdint.patch | 93 ++++++++++++++++++++++
16 dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild | 22 +++--
17 2 files changed, 103 insertions(+), 12 deletions(-)
18
19 diff --git a/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
20 new file mode 100644
21 index 00000000000..d323da1d09e
22 --- /dev/null
23 +++ b/dev-embedded/kobs-ng/files/kobs-ng-fix-stdint.patch
24 @@ -0,0 +1,93 @@
25 +--- a/src/BootControlBlocks.h
26 ++++ b/src/BootControlBlocks.h
27 +@@ -20,6 +20,8 @@
28 + #ifndef BOOTCONTROLBLOCKS_H_
29 + #define BOOTCONTROLBLOCKS_H_
30 +
31 ++#include <stdint.h>
32 ++
33 + #define NCB_FINGERPRINT1 0x504d5453 //!< 'STMP'
34 + #define NCB_FINGERPRINT2 0x2042434e //!< 'NCB<space>' - NAND Control Block
35 + #define NCB_FINGERPRINT3 0x4e494252 //!< 'RBIN' - ROM Boot Image Block - N
36 +--- a/src/bootstream.c
37 ++++ b/src/bootstream.c
38 +@@ -30,6 +30,7 @@
39 + #include <time.h>
40 + #include <alloca.h>
41 + #include <stddef.h>
42 ++#include <stdint.h>
43 +
44 + #include "config.h"
45 + #include "mtd.h"
46 +--- a/src/dcp_bootstream_ioctl.h
47 ++++ b/src/dcp_bootstream_ioctl.h
48 +@@ -20,6 +20,8 @@
49 + #ifndef DCP_BOOTSTREAM_IOCTL_H
50 + #define DCP_BOOTSTREAM_IOCTL_H
51 +
52 ++#include <stdint.h>
53 ++
54 + /* remember to have included the proper _IO definition
55 + * file before hand.
56 + * For user space it's <sys/ioctl.h>
57 +--- a/src/mtd.c
58 ++++ b/src/mtd.c
59 +@@ -24,6 +24,7 @@
60 +
61 + #define _GNU_SOURCE
62 + #include <stdio.h>
63 ++#include <stdint.h>
64 + #include <malloc.h>
65 + #include <unistd.h>
66 + #include <stdlib.h>
67 +--- a/src/mtd.h
68 ++++ b/src/mtd.h
69 +@@ -25,6 +25,8 @@
70 + #ifndef MTD_H
71 + #define MTD_H
72 +
73 ++#include <stdint.h>
74 ++
75 + #include <mtd/mtd-user.h>
76 + #include <endian.h>
77 +
78 +--- a/src/ncb.c
79 ++++ b/src/ncb.c
80 +@@ -25,6 +25,7 @@
81 + #include <string.h>
82 + #include <assert.h>
83 + #include <errno.h>
84 ++#include <stdint.h>
85 +
86 + #include "mtd.h"
87 + #include "config.h"
88 +--- a/src/plat_boot_config.h
89 ++++ b/src/plat_boot_config.h
90 +@@ -23,6 +23,7 @@
91 +
92 + #include <stdio.h>
93 + #include <stdlib.h>
94 ++#include <stdint.h>
95 +
96 + #include "mtd.h"
97 +
98 +--- a/src/rom_nand_hamming_code_ecc.c
99 ++++ b/src/rom_nand_hamming_code_ecc.c
100 +@@ -32,6 +32,7 @@
101 + // Includes and external references
102 + ////////////////////////////////////////////////////////////////////////////////
103 +
104 ++#include <stdint.h>
105 + #include <string.h>
106 +
107 + #include "rom_nand_hamming_code_ecc.h"
108 +--- a/src/sha1.c
109 ++++ b/src/sha1.c
110 +@@ -23,6 +23,7 @@
111 + * SUCH DAMAGE.
112 + */
113 +
114 ++#include <stdint.h>
115 + #include <string.h>
116 +
117 + #include "sha.h"
118
119 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
120 index fa662e6a10e..0b1be343297 100644
121 --- a/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
122 +++ b/dev-embedded/kobs-ng/kobs-ng-3.0.35.4.1.0.ebuild
123 @@ -1,26 +1,24 @@
124 -# Copyright 1999-2014 Gentoo Foundation
125 +# Copyright 1999-2020 Gentoo Authors
126 # Distributed under the terms of the GNU General Public License v2
127
128 -EAPI="4"
129 +EAPI=7
130
131 -inherit eutils versionator
132 -
133 -MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-)"
134 +MY_PV="$(ver_cut 1-3)-$(ver_cut 4-)"
135 MY_P="${PN}-${MY_PV}"
136
137 -DESCRIPTION="utility to write u-boot images to NAND on Freescale iMX devices"
138 +DESCRIPTION="Utility to write u-boot images to NAND on Freescale iMX devices"
139 HOMEPAGE="http://www.freescale.com/webapp/sps/site/prod_summary.jsp?code=IMX6_SW"
140 SRC_URI="http://storage.googleapis.com/chromeos-localmirror/distfiles/${MY_P}.tar.gz"
141
142 LICENSE="GPL-2"
143 SLOT="0"
144 KEYWORDS="~amd64 ~arm ~x86"
145 -IUSE=""
146
147 S="${WORKDIR}/${MY_P}"
148
149 -src_prepare() {
150 - epatch "${FILESDIR}"/kobs-ng-fix-mtd-defines.patch
151 - epatch "${FILESDIR}"/kobs-ng-fix-open-without-mode.patch
152 - epatch "${FILESDIR}"/kobs-ng-fix-array-violation.patch
153 -}
154 +PATCHES=(
155 + "${FILESDIR}"/${PN}-fix-mtd-defines.patch
156 + "${FILESDIR}"/${PN}-fix-open-without-mode.patch
157 + "${FILESDIR}"/${PN}-fix-array-violation.patch
158 + "${FILESDIR}"/${PN}-fix-stdint.patch
159 +)