Merge lp:~rbalint/libdebian-installer/libdebian-installer-0.110ubuntu1 into lp:~ubuntu-core-dev/libdebian-installer/ubuntu
- libdebian-installer-0.110ubuntu1
- Merge into ubuntu
Proposed by
Balint Reczey
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 399 | ||||
Proposed branch: | lp:~rbalint/libdebian-installer/libdebian-installer-0.110ubuntu1 | ||||
Merge into: | lp:~ubuntu-core-dev/libdebian-installer/ubuntu | ||||
Diff against target: |
522 lines (+162/-40) 17 files modified
Makefile.am (+4/-1) configure.ac (+7/-2) debian/changelog (+82/-0) debian/control (+5/-3) debian/rules (+5/-0) include/debian-installer/package.h (+1/-1) include/debian-installer/package_internal.h (+1/-1) include/debian-installer/release.h (+2/-2) src/exec.c (+1/-0) src/libdebian-installer-extra.ver (+7/-3) src/libdebian-installer.ver (+18/-14) src/package.c (+1/-1) src/package_parser.c (+4/-4) src/packages_parser.c (+2/-2) src/release.c (+6/-6) src/system/Makefile.am (+1/-0) src/system/subarch-arm-linux.c (+15/-0) |
||||
To merge this branch: | bzr merge lp:~rbalint/libdebian-installer/libdebian-installer-0.110ubuntu1 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Review via email: mp+323621@code.launchpad.net |
Commit message
Description of the change
* Merge from Debian unstable. (LP: #1688246) Remaining changes:
- Add more OMAP4 Panda support.
- Add OMAP4 Blaze support.
- Add Freescale "P4080 DS" and "QEMU e500" support.
- Point to Bazaar packaging repository on Launchpad
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'Makefile.am' | |||
2 | --- Makefile.am 2015-05-24 22:16:15 +0000 | |||
3 | +++ Makefile.am 2017-05-04 17:27:22 +0000 | |||
4 | @@ -1,6 +1,9 @@ | |||
5 | 1 | AUTOMAKE_OPTIONS = foreign | 1 | AUTOMAKE_OPTIONS = foreign |
6 | 2 | 2 | ||
8 | 3 | SUBDIRS = doc include src test | 3 | SUBDIRS = doc include src |
9 | 4 | if ENABLE_CHECK | ||
10 | 5 | SUBDIRS += test | ||
11 | 6 | endif | ||
12 | 4 | 7 | ||
13 | 5 | pkgconfigdir = ${libdir}/pkgconfig | 8 | pkgconfigdir = ${libdir}/pkgconfig |
14 | 6 | pkgconfig_DATA = \ | 9 | pkgconfig_DATA = \ |
15 | 7 | 10 | ||
16 | === modified file 'configure.ac' | |||
17 | --- configure.ac 2015-05-24 22:16:15 +0000 | |||
18 | +++ configure.ac 2017-05-04 17:27:22 +0000 | |||
19 | @@ -7,13 +7,18 @@ | |||
20 | 7 | 7 | ||
21 | 8 | AC_CHECK_FUNCS(memrchr) | 8 | AC_CHECK_FUNCS(memrchr) |
22 | 9 | 9 | ||
23 | 10 | AC_ARG_ENABLE([check],AS_HELP_STRING([--disable-check],[Disable running the test suite])) | ||
24 | 11 | |||
25 | 10 | AC_CHECK_PROGS(DOXYGEN, doxygen, true) | 12 | AC_CHECK_PROGS(DOXYGEN, doxygen, true) |
26 | 11 | 13 | ||
28 | 12 | PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) | 14 | AS_IF([test "x$enable_check" != xno],[ |
29 | 15 | PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) | ||
30 | 16 | ]) | ||
31 | 17 | AM_CONDITIONAL([ENABLE_CHECK],[test "x$enable_check" != xno]) | ||
32 | 13 | 18 | ||
33 | 14 | LIBRARY_VERSION_MAJOR=4 | 19 | LIBRARY_VERSION_MAJOR=4 |
34 | 15 | LIBRARY_VERSION_MINOR=0 | 20 | LIBRARY_VERSION_MINOR=0 |
36 | 16 | LIBRARY_VERSION_REVISION=7 | 21 | LIBRARY_VERSION_REVISION=8 |
37 | 17 | LIBRARY_VERSION="$LIBRARY_VERSION_MAJOR.$LIBRARY_VERSION_MINOR.$LIBRARY_VERSION_REVISION" | 22 | LIBRARY_VERSION="$LIBRARY_VERSION_MAJOR.$LIBRARY_VERSION_MINOR.$LIBRARY_VERSION_REVISION" |
38 | 18 | LIBRARY_VERSION_LIBTOOL="$LIBRARY_VERSION_MAJOR:$LIBRARY_VERSION_MINOR:$LIBRARY_VERSION_REVISION" | 23 | LIBRARY_VERSION_LIBTOOL="$LIBRARY_VERSION_MAJOR:$LIBRARY_VERSION_MINOR:$LIBRARY_VERSION_REVISION" |
39 | 19 | 24 | ||
40 | 20 | 25 | ||
41 | === modified file 'debian/changelog' | |||
42 | --- debian/changelog 2017-05-04 15:59:21 +0000 | |||
43 | +++ debian/changelog 2017-05-04 17:27:22 +0000 | |||
44 | @@ -1,3 +1,85 @@ | |||
45 | 1 | libdebian-installer (0.110ubuntu1) artful; urgency=low | ||
46 | 2 | |||
47 | 3 | * Merge from Debian unstable. (LP: #1688246) Remaining changes: | ||
48 | 4 | - Add more OMAP4 Panda support. | ||
49 | 5 | - Add OMAP4 Blaze support. | ||
50 | 6 | - Add Freescale "P4080 DS" and "QEMU e500" support. | ||
51 | 7 | - Point to Bazaar packaging repository on Launchpad | ||
52 | 8 | |||
53 | 9 | -- Balint Reczey <rbalint@ubuntu.com> Thu, 04 May 2017 13:36:00 +0200 | ||
54 | 10 | |||
55 | 11 | libdebian-installer (0.110) unstable; urgency=medium | ||
56 | 12 | |||
57 | 13 | [ Martin Michlmayr ] | ||
58 | 14 | * subarch-arm-linux.c: Add NETGEAR ReadyNAS Duo v2. Closes: #855965 | ||
59 | 15 | |||
60 | 16 | -- Christian Perrier <bubulle@debian.org> Wed, 22 Mar 2017 11:59:18 +0100 | ||
61 | 17 | |||
62 | 18 | libdebian-installer (0.109) unstable; urgency=medium | ||
63 | 19 | |||
64 | 20 | [ Samuel Thibault ] | ||
65 | 21 | * Fix build with gcc-7. Closes: #853489 | ||
66 | 22 | |||
67 | 23 | [ Steven Chamberlain ] | ||
68 | 24 | * Parse SHA256 fields in Packages files. (closes: #856210) | ||
69 | 25 | * Parse SHA256 fields in Release files. | ||
70 | 26 | |||
71 | 27 | [ Bastian Blank ] | ||
72 | 28 | * Update versions for changed symbols. | ||
73 | 29 | - Add Breaks on cdebootstrap. | ||
74 | 30 | |||
75 | 31 | -- Bastian Blank <waldi@debian.org> Sun, 05 Mar 2017 11:02:27 +0000 | ||
76 | 32 | |||
77 | 33 | libdebian-installer (0.108) unstable; urgency=medium | ||
78 | 34 | |||
79 | 35 | [ Helmut Grohne ] | ||
80 | 36 | * Make Build-Depends: check optional via <!nocheck> profile. | ||
81 | 37 | Closes: #787044. | ||
82 | 38 | |||
83 | 39 | -- Christian Perrier <bubulle@debian.org> Tue, 30 Aug 2016 06:45:17 +0200 | ||
84 | 40 | |||
85 | 41 | libdebian-installer (0.107) unstable; urgency=medium | ||
86 | 42 | |||
87 | 43 | [ Steve McIntyre ] | ||
88 | 44 | * armel/armhf: Fix missing efi include FTBFS | ||
89 | 45 | |||
90 | 46 | -- Christian Perrier <bubulle@debian.org> Mon, 20 Jun 2016 08:21:12 +0200 | ||
91 | 47 | |||
92 | 48 | libdebian-installer (0.106) unstable; urgency=medium | ||
93 | 49 | |||
94 | 50 | [ Steve McIntyre ] | ||
95 | 51 | * armhf: Add EFI detection. | ||
96 | 52 | |||
97 | 53 | [ Mathieu Trudel-Lapierre ] | ||
98 | 54 | * validate the presence of efivars *or* vars under /sys/firmware/efi to | ||
99 | 55 | decide whether we should show the system as running in EFI mode; | ||
100 | 56 | either of these paths is required for efibootmgr to set a BootEntry at | ||
101 | 57 | the end of installation. Closes: #826665 | ||
102 | 58 | |||
103 | 59 | -- Christian Perrier <bubulle@debian.org> Sun, 12 Jun 2016 09:06:30 +0200 | ||
104 | 60 | |||
105 | 61 | libdebian-installer (0.105) unstable; urgency=medium | ||
106 | 62 | |||
107 | 63 | [ Aurelien Jarno ] | ||
108 | 64 | * Add mips64el support. | ||
109 | 65 | |||
110 | 66 | -- Aurelien Jarno <aurel32@debian.org> Sun, 22 May 2016 15:21:37 +0200 | ||
111 | 67 | |||
112 | 68 | libdebian-installer (0.104) unstable; urgency=medium | ||
113 | 69 | |||
114 | 70 | [ Roger Shimizu ] | ||
115 | 71 | * armel: Add various orion5x/kirkwood based Buffalo Linkstation devices | ||
116 | 72 | supported by device-tree | ||
117 | 73 | |||
118 | 74 | -- Christian Perrier <bubulle@debian.org> Wed, 17 Feb 2016 07:05:06 +0100 | ||
119 | 75 | |||
120 | 76 | libdebian-installer (0.103) unstable; urgency=medium | ||
121 | 77 | |||
122 | 78 | [ Colin Watson ] | ||
123 | 79 | * Use HTTPS for Vcs-* URLs, and link to cgit rather than gitweb. | ||
124 | 80 | |||
125 | 81 | -- Christian Perrier <bubulle@debian.org> Sat, 13 Feb 2016 15:17:19 +0100 | ||
126 | 82 | |||
127 | 1 | libdebian-installer (0.102ubuntu3) yakkety; urgency=medium | 83 | libdebian-installer (0.102ubuntu3) yakkety; urgency=medium |
128 | 2 | 84 | ||
129 | 3 | * src/system/efi.c: fix my blunder; we still need to have ret declared as an | 85 | * src/system/efi.c: fix my blunder; we still need to have ret declared as an |
130 | 4 | 86 | ||
131 | === modified file 'debian/control' | |||
132 | --- debian/control 2015-12-24 00:41:40 +0000 | |||
133 | +++ debian/control 2017-05-04 17:27:22 +0000 | |||
134 | @@ -4,10 +4,10 @@ | |||
135 | 4 | Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com> | 4 | Maintainer: Ubuntu Installer Team <ubuntu-installer@lists.ubuntu.com> |
136 | 5 | XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org> | 5 | XSBC-Original-Maintainer: Debian Install System Team <debian-boot@lists.debian.org> |
137 | 6 | Uploaders: Bastian Blank <waldi@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org> | 6 | Uploaders: Bastian Blank <waldi@debian.org>, Colin Watson <cjwatson@debian.org>, Christian Perrier <bubulle@debian.org>, Steve McIntyre <93sam@debian.org> |
139 | 7 | Build-Depends: dpkg-dev (>= 1.13.5), debhelper (>= 9), dh-autoreconf, doxygen, pkg-config, check | 7 | Build-Depends: dpkg-dev (>= 1.13.5), debhelper (>= 9), dh-autoreconf, doxygen, pkg-config, check <!nocheck> |
140 | 8 | Standards-Version: 3.9.6 | 8 | Standards-Version: 3.9.6 |
143 | 9 | XS-Debian-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=d-i/libdebian-installer.git | 9 | XS-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/libdebian-installer.git |
144 | 10 | XS-Debian-Vcs-Git: git://anonscm.debian.org/d-i/libdebian-installer.git | 10 | XS-Vcs-Git: https://anonscm.debian.org/git/d-i/libdebian-installer.git |
145 | 11 | Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libdebian-installer/ubuntu | 11 | Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/libdebian-installer/ubuntu |
146 | 12 | 12 | ||
147 | 13 | Package: libdebian-installer4 | 13 | Package: libdebian-installer4 |
148 | @@ -15,6 +15,7 @@ | |||
149 | 15 | Multi-Arch: same | 15 | Multi-Arch: same |
150 | 16 | Pre-Depends: ${misc:Pre-Depends} | 16 | Pre-Depends: ${misc:Pre-Depends} |
151 | 17 | Depends: ${shlibs:Depends}, ${misc:Depends} | 17 | Depends: ${shlibs:Depends}, ${misc:Depends} |
152 | 18 | Breaks: cdebootstrap (<< 0.7.6+) | ||
153 | 18 | Description: Library of common debian-installer functions | 19 | Description: Library of common debian-installer functions |
154 | 19 | This library is used by debian-installer to perform common functions | 20 | This library is used by debian-installer to perform common functions |
155 | 20 | such as logging messages and executing commands. If you aren't | 21 | such as logging messages and executing commands. If you aren't |
156 | @@ -50,6 +51,7 @@ | |||
157 | 50 | Architecture: any | 51 | Architecture: any |
158 | 51 | Multi-Arch: same | 52 | Multi-Arch: same |
159 | 52 | Depends: ${shlibs:Depends}, ${misc:Depends}, libdebian-installer4 (= ${binary:Version}) | 53 | Depends: ${shlibs:Depends}, ${misc:Depends}, libdebian-installer4 (= ${binary:Version}) |
160 | 54 | Breaks: cdebootstrap (<< 0.7.6+) | ||
161 | 53 | Description: Library of some extra debian-installer functions | 55 | Description: Library of some extra debian-installer functions |
162 | 54 | This library is used by debian-installer to perform common functions | 56 | This library is used by debian-installer to perform common functions |
163 | 55 | such as logging messages and executing commands. If you aren't | 57 | such as logging messages and executing commands. If you aren't |
164 | 56 | 58 | ||
165 | === modified file 'debian/rules' | |||
166 | --- debian/rules 2013-06-07 12:14:22 +0000 | |||
167 | +++ debian/rules 2017-05-04 17:27:22 +0000 | |||
168 | @@ -16,6 +16,11 @@ | |||
169 | 16 | 16 | ||
170 | 17 | export CFLAGS | 17 | export CFLAGS |
171 | 18 | 18 | ||
172 | 19 | ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) | ||
173 | 20 | override_dh_auto_configure: | ||
174 | 21 | dh_auto_configure -- --disable-check | ||
175 | 22 | endif | ||
176 | 23 | |||
177 | 19 | override_dh_auto_build: | 24 | override_dh_auto_build: |
178 | 20 | dh_auto_build | 25 | dh_auto_build |
179 | 21 | $(MAKE) -C build/doc doc | 26 | $(MAKE) -C build/doc doc |
180 | 22 | 27 | ||
181 | === modified file 'include/debian-installer/package.h' | |||
182 | --- include/debian-installer/package.h 2011-03-02 17:11:54 +0000 | |||
183 | +++ include/debian-installer/package.h 2017-05-04 17:27:22 +0000 | |||
184 | @@ -112,7 +112,7 @@ | |||
185 | 112 | di_slist depends; /**< Any different dependency types */ | 112 | di_slist depends; /**< Any different dependency types */ |
186 | 113 | char *filename; /**< Filename field */ | 113 | char *filename; /**< Filename field */ |
187 | 114 | size_t size; /**< Size field */ | 114 | size_t size; /**< Size field */ |
189 | 115 | char *md5sum; /**< MD5Sum field */ | 115 | char *sha256; /**< SHA256 field */ |
190 | 116 | char *short_description; /**< Description field, first part*/ | 116 | char *short_description; /**< Description field, first part*/ |
191 | 117 | char *description; /**< Description field, second part */ | 117 | char *description; /**< Description field, second part */ |
192 | 118 | unsigned int resolver; /**< @internal */ | 118 | unsigned int resolver; /**< @internal */ |
193 | 119 | 119 | ||
194 | === modified file 'include/debian-installer/package_internal.h' | |||
195 | --- include/debian-installer/package_internal.h 2011-03-02 17:11:54 +0000 | |||
196 | +++ include/debian-installer/package_internal.h 2017-05-04 17:27:22 +0000 | |||
197 | @@ -52,7 +52,7 @@ | |||
198 | 52 | internal_di_package_parser_field_enhances, | 52 | internal_di_package_parser_field_enhances, |
199 | 53 | internal_di_package_parser_field_filename, | 53 | internal_di_package_parser_field_filename, |
200 | 54 | internal_di_package_parser_field_size, | 54 | internal_di_package_parser_field_size, |
202 | 55 | internal_di_package_parser_field_md5sum, | 55 | internal_di_package_parser_field_sha256, |
203 | 56 | internal_di_package_parser_field_description; | 56 | internal_di_package_parser_field_description; |
204 | 57 | 57 | ||
205 | 58 | /** | 58 | /** |
206 | 59 | 59 | ||
207 | === modified file 'include/debian-installer/release.h' | |||
208 | --- include/debian-installer/release.h 2011-03-02 17:11:54 +0000 | |||
209 | +++ include/debian-installer/release.h 2017-05-04 17:27:22 +0000 | |||
210 | @@ -40,7 +40,7 @@ | |||
211 | 40 | char *origin; /**< Origin field */ | 40 | char *origin; /**< Origin field */ |
212 | 41 | char *suite; /**< Suite field */ | 41 | char *suite; /**< Suite field */ |
213 | 42 | char *codename; /**< Codename field */ | 42 | char *codename; /**< Codename field */ |
215 | 43 | di_hash_table *md5sum; /**< checksum fields, includes di_release_file */ | 43 | di_hash_table *sha256; /**< checksum fields, includes di_release_file */ |
216 | 44 | di_mem_chunk *release_file_mem_chunk; /**< @internal */ | 44 | di_mem_chunk *release_file_mem_chunk; /**< @internal */ |
217 | 45 | }; | 45 | }; |
218 | 46 | 46 | ||
219 | @@ -55,7 +55,7 @@ | |||
220 | 55 | di_rstring key; /**< @internal */ | 55 | di_rstring key; /**< @internal */ |
221 | 56 | }; | 56 | }; |
222 | 57 | unsigned int size; /**< size */ | 57 | unsigned int size; /**< size */ |
224 | 58 | char *sum[2]; /**< checksums, currently md5 and sha1 */ | 58 | char *sum[2]; /**< checksums, currently md5 and sha256 */ |
225 | 59 | }; | 59 | }; |
226 | 60 | 60 | ||
227 | 61 | di_release *di_release_alloc (void); | 61 | di_release *di_release_alloc (void); |
228 | 62 | 62 | ||
229 | === modified file 'src/exec.c' | |||
230 | --- src/exec.c 2013-11-14 22:09:38 +0000 | |||
231 | +++ src/exec.c 2017-05-04 17:27:22 +0000 | |||
232 | @@ -159,6 +159,7 @@ | |||
233 | 159 | break; | 159 | break; |
234 | 160 | case 3: | 160 | case 3: |
235 | 161 | files[1].handler = stderr_handler; | 161 | files[1].handler = stderr_handler; |
236 | 162 | /* Fall through */ | ||
237 | 162 | case 1: | 163 | case 1: |
238 | 163 | files[0].handler = stdout_handler; | 164 | files[0].handler = stdout_handler; |
239 | 164 | break; | 165 | break; |
240 | 165 | 166 | ||
241 | === modified file 'src/libdebian-installer-extra.ver' | |||
242 | --- src/libdebian-installer-extra.ver 2004-02-01 16:38:12 +0000 | |||
243 | +++ src/libdebian-installer-extra.ver 2017-05-04 17:27:22 +0000 | |||
244 | @@ -9,12 +9,16 @@ | |||
245 | 9 | di_list_prepend_chunk; | 9 | di_list_prepend_chunk; |
246 | 10 | di_release_alloc; | 10 | di_release_alloc; |
247 | 11 | di_release_free; | 11 | di_release_free; |
248 | 12 | local: | ||
249 | 13 | *; | ||
250 | 14 | }; | ||
251 | 15 | |||
252 | 16 | LIBDI_4.8 { | ||
253 | 17 | global: | ||
254 | 12 | di_release_parser_fieldinfo; | 18 | di_release_parser_fieldinfo; |
255 | 13 | di_release_parser_read_file; | 19 | di_release_parser_read_file; |
256 | 14 | di_release_read_file; | 20 | di_release_read_file; |
260 | 15 | local: | 21 | } LIBDI_4.1; |
258 | 16 | *; | ||
259 | 17 | }; | ||
261 | 18 | 22 | ||
262 | 19 | #LIBDI_PRIVATE { | 23 | #LIBDI_PRIVATE { |
263 | 20 | # global: | 24 | # global: |
264 | 21 | 25 | ||
265 | === modified file 'src/libdebian-installer.ver' | |||
266 | --- src/libdebian-installer.ver 2010-09-13 16:44:53 +0000 | |||
267 | +++ src/libdebian-installer.ver 2017-05-04 17:27:22 +0000 | |||
268 | @@ -26,7 +26,6 @@ | |||
269 | 26 | di_mem_chunk_new; | 26 | di_mem_chunk_new; |
270 | 27 | di_mem_chunk_size; | 27 | di_mem_chunk_size; |
271 | 28 | di_package_destroy; | 28 | di_package_destroy; |
272 | 29 | di_package_parser_fieldinfo; | ||
273 | 30 | di_package_parser_info; | 29 | di_package_parser_info; |
274 | 31 | di_package_parser_read_dependency; | 30 | di_package_parser_read_dependency; |
275 | 32 | di_package_parser_read_description; | 31 | di_package_parser_read_description; |
276 | @@ -37,7 +36,6 @@ | |||
277 | 37 | di_package_parser_write_description; | 36 | di_package_parser_write_description; |
278 | 38 | di_package_parser_write_priority; | 37 | di_package_parser_write_priority; |
279 | 39 | di_package_parser_write_status; | 38 | di_package_parser_write_status; |
280 | 40 | di_package_special_read_file; | ||
281 | 41 | di_package_version_compare; | 39 | di_package_version_compare; |
282 | 42 | di_package_version_free; | 40 | di_package_version_free; |
283 | 43 | di_package_version_parse; | 41 | di_package_version_parse; |
284 | @@ -48,18 +46,10 @@ | |||
285 | 48 | di_packages_free; | 46 | di_packages_free; |
286 | 49 | di_packages_get_package; | 47 | di_packages_get_package; |
287 | 50 | di_packages_get_package_new; | 48 | di_packages_get_package_new; |
288 | 51 | di_packages_minimal_parser_fieldinfo; | ||
289 | 52 | di_packages_minimal_parser_info; | ||
290 | 53 | di_packages_parser_fieldinfo; | ||
291 | 54 | di_packages_parser_info; | ||
292 | 55 | di_packages_parser_read_name; | 49 | di_packages_parser_read_name; |
293 | 56 | di_packages_resolve_dependencies; | 50 | di_packages_resolve_dependencies; |
294 | 57 | di_packages_resolve_dependencies_array; | 51 | di_packages_resolve_dependencies_array; |
295 | 58 | di_packages_resolve_dependencies_mark; | 52 | di_packages_resolve_dependencies_mark; |
296 | 59 | di_packages_special_read_file; | ||
297 | 60 | di_packages_special_write_file; | ||
298 | 61 | di_packages_status_parser_fieldinfo; | ||
299 | 62 | di_packages_status_parser_info; | ||
300 | 63 | di_parser_info_add; | 53 | di_parser_info_add; |
301 | 64 | di_parser_info_alloc; | 54 | di_parser_info_alloc; |
302 | 65 | di_parser_info_free; | 55 | di_parser_info_free; |
303 | @@ -89,12 +79,8 @@ | |||
304 | 89 | di_system_dpkg_package_control_file_exec; | 79 | di_system_dpkg_package_control_file_exec; |
305 | 90 | di_system_init; | 80 | di_system_init; |
306 | 91 | di_system_package_destroy; | 81 | di_system_package_destroy; |
307 | 92 | di_system_package_parser_fieldinfo; | ||
308 | 93 | di_system_package_parser_info; | ||
309 | 94 | di_system_packages_alloc; | 82 | di_system_packages_alloc; |
310 | 95 | di_system_packages_allocator_alloc; | 83 | di_system_packages_allocator_alloc; |
311 | 96 | di_system_packages_parser_info; | ||
312 | 97 | di_system_packages_status_parser_info; | ||
313 | 98 | di_system_prebaseconfig_append; | 84 | di_system_prebaseconfig_append; |
314 | 99 | di_vlog; | 85 | di_vlog; |
315 | 100 | local: | 86 | local: |
316 | @@ -160,6 +146,24 @@ | |||
317 | 160 | di_system_subarch_analyze_guess; | 146 | di_system_subarch_analyze_guess; |
318 | 161 | } LIBDI_4.6; | 147 | } LIBDI_4.6; |
319 | 162 | 148 | ||
320 | 149 | LIBDI_4.8 { | ||
321 | 150 | global: | ||
322 | 151 | di_package_parser_fieldinfo; | ||
323 | 152 | di_package_special_read_file; | ||
324 | 153 | di_packages_minimal_parser_fieldinfo; | ||
325 | 154 | di_packages_minimal_parser_info; | ||
326 | 155 | di_packages_parser_fieldinfo; | ||
327 | 156 | di_packages_parser_info; | ||
328 | 157 | di_packages_special_read_file; | ||
329 | 158 | di_packages_special_write_file; | ||
330 | 159 | di_packages_status_parser_fieldinfo; | ||
331 | 160 | di_packages_status_parser_info; | ||
332 | 161 | di_system_package_parser_fieldinfo; | ||
333 | 162 | di_system_package_parser_info; | ||
334 | 163 | di_system_packages_parser_info; | ||
335 | 164 | di_system_packages_status_parser_info; | ||
336 | 165 | } LIBDI_4.7; | ||
337 | 166 | |||
338 | 163 | #LIBDI_PRIVATE { | 167 | #LIBDI_PRIVATE { |
339 | 164 | # global: | 168 | # global: |
340 | 165 | # internal_*; | 169 | # internal_*; |
341 | 166 | 170 | ||
342 | === modified file 'src/package.c' | |||
343 | --- src/package.c 2011-03-02 17:11:54 +0000 | |||
344 | +++ src/package.c 2017-05-04 17:27:22 +0000 | |||
345 | @@ -38,7 +38,7 @@ | |||
346 | 38 | di_free (package->architecture); | 38 | di_free (package->architecture); |
347 | 39 | di_free (package->version); | 39 | di_free (package->version); |
348 | 40 | di_free (package->filename); | 40 | di_free (package->filename); |
350 | 41 | di_free (package->md5sum); | 41 | di_free (package->sha256); |
351 | 42 | di_free (package->short_description); | 42 | di_free (package->short_description); |
352 | 43 | di_free (package->description); | 43 | di_free (package->description); |
353 | 44 | 44 | ||
354 | 45 | 45 | ||
355 | === modified file 'src/package_parser.c' | |||
356 | --- src/package_parser.c 2011-03-02 17:11:54 +0000 | |||
357 | +++ src/package_parser.c 2017-05-04 17:27:22 +0000 | |||
358 | @@ -180,13 +180,13 @@ | |||
359 | 180 | di_parser_write_int, | 180 | di_parser_write_int, |
360 | 181 | offsetof (di_package, size) | 181 | offsetof (di_package, size) |
361 | 182 | ), | 182 | ), |
363 | 183 | internal_di_package_parser_field_md5sum = | 183 | internal_di_package_parser_field_sha256 = |
364 | 184 | DI_PARSER_FIELDINFO | 184 | DI_PARSER_FIELDINFO |
365 | 185 | ( | 185 | ( |
367 | 186 | "MD5sum", | 186 | "SHA256", |
368 | 187 | di_parser_read_string, | 187 | di_parser_read_string, |
369 | 188 | di_parser_write_string, | 188 | di_parser_write_string, |
371 | 189 | offsetof (di_package, md5sum) | 189 | offsetof (di_package, sha256) |
372 | 190 | ), | 190 | ), |
373 | 191 | internal_di_package_parser_field_description = | 191 | internal_di_package_parser_field_description = |
374 | 192 | DI_PARSER_FIELDINFO | 192 | DI_PARSER_FIELDINFO |
375 | @@ -217,7 +217,7 @@ | |||
376 | 217 | &internal_di_package_parser_field_enhances, | 217 | &internal_di_package_parser_field_enhances, |
377 | 218 | &internal_di_package_parser_field_filename, | 218 | &internal_di_package_parser_field_filename, |
378 | 219 | &internal_di_package_parser_field_size, | 219 | &internal_di_package_parser_field_size, |
380 | 220 | &internal_di_package_parser_field_md5sum, | 220 | &internal_di_package_parser_field_sha256, |
381 | 221 | &internal_di_package_parser_field_description, | 221 | &internal_di_package_parser_field_description, |
382 | 222 | NULL | 222 | NULL |
383 | 223 | }; | 223 | }; |
384 | 224 | 224 | ||
385 | === modified file 'src/packages_parser.c' | |||
386 | --- src/packages_parser.c 2011-03-02 17:11:54 +0000 | |||
387 | +++ src/packages_parser.c 2017-05-04 17:27:22 +0000 | |||
388 | @@ -65,7 +65,7 @@ | |||
389 | 65 | &internal_di_package_parser_field_enhances, | 65 | &internal_di_package_parser_field_enhances, |
390 | 66 | &internal_di_package_parser_field_filename, | 66 | &internal_di_package_parser_field_filename, |
391 | 67 | &internal_di_package_parser_field_size, | 67 | &internal_di_package_parser_field_size, |
393 | 68 | &internal_di_package_parser_field_md5sum, | 68 | &internal_di_package_parser_field_sha256, |
394 | 69 | &internal_di_package_parser_field_description, | 69 | &internal_di_package_parser_field_description, |
395 | 70 | NULL | 70 | NULL |
396 | 71 | }; | 71 | }; |
397 | @@ -109,7 +109,7 @@ | |||
398 | 109 | &internal_di_package_parser_field_depends, | 109 | &internal_di_package_parser_field_depends, |
399 | 110 | &internal_di_package_parser_field_pre_depends, | 110 | &internal_di_package_parser_field_pre_depends, |
400 | 111 | &internal_di_package_parser_field_filename, | 111 | &internal_di_package_parser_field_filename, |
402 | 112 | &internal_di_package_parser_field_md5sum, | 112 | &internal_di_package_parser_field_sha256, |
403 | 113 | &internal_di_package_parser_field_size, | 113 | &internal_di_package_parser_field_size, |
404 | 114 | NULL | 114 | NULL |
405 | 115 | }; | 115 | }; |
406 | 116 | 116 | ||
407 | === modified file 'src/release.c' | |||
408 | --- src/release.c 2011-03-02 17:11:54 +0000 | |||
409 | +++ src/release.c 2017-05-04 17:27:22 +0000 | |||
410 | @@ -69,10 +69,10 @@ | |||
411 | 69 | NULL, | 69 | NULL, |
412 | 70 | 0 | 70 | 0 |
413 | 71 | ), | 71 | ), |
415 | 72 | internal_di_release_parser_field_sha1 = | 72 | internal_di_release_parser_field_sha256 = |
416 | 73 | DI_PARSER_FIELDINFO | 73 | DI_PARSER_FIELDINFO |
417 | 74 | ( | 74 | ( |
419 | 75 | "SHA1", | 75 | "SHA256", |
420 | 76 | di_release_parser_read_file, | 76 | di_release_parser_read_file, |
421 | 77 | NULL, | 77 | NULL, |
422 | 78 | 1 | 78 | 1 |
423 | @@ -87,7 +87,7 @@ | |||
424 | 87 | &internal_di_release_parser_field_suite, | 87 | &internal_di_release_parser_field_suite, |
425 | 88 | &internal_di_release_parser_field_codename, | 88 | &internal_di_release_parser_field_codename, |
426 | 89 | &internal_di_release_parser_field_md5sum, | 89 | &internal_di_release_parser_field_md5sum, |
428 | 90 | &internal_di_release_parser_field_sha1, | 90 | &internal_di_release_parser_field_sha256, |
429 | 91 | NULL | 91 | NULL |
430 | 92 | }; | 92 | }; |
431 | 93 | 93 | ||
432 | @@ -110,7 +110,7 @@ | |||
433 | 110 | di_release *ret; | 110 | di_release *ret; |
434 | 111 | 111 | ||
435 | 112 | ret = di_new0 (di_release, 1); | 112 | ret = di_new0 (di_release, 1); |
437 | 113 | ret->md5sum = di_hash_table_new_full (di_rstring_hash, di_rstring_equal, NULL, internal_di_release_file_destroy_func); | 113 | ret->sha256 = di_hash_table_new_full (di_rstring_hash, di_rstring_equal, NULL, internal_di_release_file_destroy_func); |
438 | 114 | ret->release_file_mem_chunk = di_mem_chunk_new (sizeof (di_release_file), 4096); | 114 | ret->release_file_mem_chunk = di_mem_chunk_new (sizeof (di_release_file), 4096); |
439 | 115 | 115 | ||
440 | 116 | return ret; | 116 | return ret; |
441 | @@ -124,7 +124,7 @@ | |||
442 | 124 | di_free (release->origin); | 124 | di_free (release->origin); |
443 | 125 | di_free (release->suite); | 125 | di_free (release->suite); |
444 | 126 | di_free (release->codename); | 126 | di_free (release->codename); |
446 | 127 | di_hash_table_destroy (release->md5sum); | 127 | di_hash_table_destroy (release->sha256); |
447 | 128 | di_mem_chunk_destroy (release->release_file_mem_chunk); | 128 | di_mem_chunk_destroy (release->release_file_mem_chunk); |
448 | 129 | di_free (release); | 129 | di_free (release); |
449 | 130 | } | 130 | } |
450 | @@ -169,7 +169,7 @@ | |||
451 | 169 | int ret; | 169 | int ret; |
452 | 170 | size_t buf_size; | 170 | size_t buf_size; |
453 | 171 | di_release *release = *data; | 171 | di_release *release = *data; |
455 | 172 | di_hash_table *table = release->md5sum; | 172 | di_hash_table *table = release->sha256; |
456 | 173 | 173 | ||
457 | 174 | while (1) | 174 | while (1) |
458 | 175 | { | 175 | { |
459 | 176 | 176 | ||
460 | === modified file 'src/system/Makefile.am' | |||
461 | --- src/system/Makefile.am 2015-12-24 00:41:40 +0000 | |||
462 | +++ src/system/Makefile.am 2017-05-04 17:27:22 +0000 | |||
463 | @@ -25,6 +25,7 @@ | |||
464 | 25 | subarch-m68k-linux.c \ | 25 | subarch-m68k-linux.c \ |
465 | 26 | subarch-mips-linux.c \ | 26 | subarch-mips-linux.c \ |
466 | 27 | subarch-mipsel-linux.c \ | 27 | subarch-mipsel-linux.c \ |
467 | 28 | subarch-mips64el-linux.c \ | ||
468 | 28 | subarch-powerpc-linux.c \ | 29 | subarch-powerpc-linux.c \ |
469 | 29 | subarch-ppc64-linux.c \ | 30 | subarch-ppc64-linux.c \ |
470 | 30 | subarch-ppc64el-linux.c \ | 31 | subarch-ppc64el-linux.c \ |
471 | 31 | 32 | ||
472 | === modified file 'src/system/subarch-arm-linux.c' | |||
473 | --- src/system/subarch-arm-linux.c 2015-12-24 00:41:40 +0000 | |||
474 | +++ src/system/subarch-arm-linux.c 2017-05-04 17:27:22 +0000 | |||
475 | @@ -6,6 +6,7 @@ | |||
476 | 6 | #include <sys/utsname.h> | 6 | #include <sys/utsname.h> |
477 | 7 | 7 | ||
478 | 8 | #include <debian-installer/system/subarch.h> | 8 | #include <debian-installer/system/subarch.h> |
479 | 9 | #include <debian-installer/system/efi.h> | ||
480 | 9 | 10 | ||
481 | 10 | struct map { | 11 | struct map { |
482 | 11 | char *entry; | 12 | char *entry; |
483 | @@ -64,6 +65,7 @@ | |||
484 | 64 | { "LaCie 2Big Network v2", "kirkwood" }, | 65 | { "LaCie 2Big Network v2", "kirkwood" }, |
485 | 65 | { "LaCie 5Big Network v2", "kirkwood" }, | 66 | { "LaCie 5Big Network v2", "kirkwood" }, |
486 | 66 | { "Iomega Iconnect", "kirkwood" }, | 67 | { "Iomega Iconnect", "kirkwood" }, |
487 | 68 | { "NETGEAR ReadyNAS Duo v2", "kirkwood" }, | ||
488 | 67 | { "Buffalo/Revogear Kurobox Pro", "orion5x" }, | 69 | { "Buffalo/Revogear Kurobox Pro", "orion5x" }, |
489 | 68 | { "D-Link DNS-323", "orion5x" }, | 70 | { "D-Link DNS-323", "orion5x" }, |
490 | 69 | { "QNAP TS-109/TS-209", "orion5x" }, | 71 | { "QNAP TS-109/TS-209", "orion5x" }, |
491 | @@ -71,8 +73,17 @@ | |||
492 | 71 | { "HP Media Vault mv2120", "orion5x" }, | 73 | { "HP Media Vault mv2120", "orion5x" }, |
493 | 72 | { "Buffalo Linkstation LiveV3 (LS-CHL)", "orion5x" }, | 74 | { "Buffalo Linkstation LiveV3 (LS-CHL)", "orion5x" }, |
494 | 73 | { "Buffalo Linkstation LS-CHLv2", "kirkwood" }, /* aka: LS-CH1.0L */ | 75 | { "Buffalo Linkstation LS-CHLv2", "kirkwood" }, /* aka: LS-CH1.0L */ |
495 | 76 | { "Buffalo Linkstation LS-QVL", "kirkwood" }, | ||
496 | 77 | { "Buffalo Linkstation LS-VL", "kirkwood" }, | ||
497 | 78 | { "Buffalo Linkstation LS-WSXL", "kirkwood" }, | ||
498 | 79 | { "Buffalo Linkstation LS-WTGL", "orion5x" }, | ||
499 | 80 | { "Buffalo Linkstation LS-WVL", "kirkwood" }, | ||
500 | 81 | { "Buffalo Linkstation LS-WVL/VL", "kirkwood" }, | ||
501 | 82 | { "Buffalo Linkstation LS-WXL", "kirkwood" }, | ||
502 | 83 | { "Buffalo Linkstation LS-WXL/WSXL", "kirkwood" }, | ||
503 | 74 | { "Buffalo Linkstation LS-XHL", "kirkwood" }, | 84 | { "Buffalo Linkstation LS-XHL", "kirkwood" }, |
504 | 75 | { "Buffalo Linkstation Mini", "orion5x" }, | 85 | { "Buffalo Linkstation Mini", "orion5x" }, |
505 | 86 | { "Buffalo Linkstation Mini (LS-WSGL)", "orion5x" }, | ||
506 | 76 | { "Buffalo Linkstation Pro/Live", "orion5x" }, | 87 | { "Buffalo Linkstation Pro/Live", "orion5x" }, |
507 | 77 | { "Marvell Orion-NAS Reference Design", "orion5x" }, | 88 | { "Marvell Orion-NAS Reference Design", "orion5x" }, |
508 | 78 | { "Marvell Orion-2 Development Board", "orion5x" }, | 89 | { "Marvell Orion-2 Development Board", "orion5x" }, |
509 | @@ -193,6 +204,10 @@ | |||
510 | 193 | struct utsname sysinfo; | 204 | struct utsname sysinfo; |
511 | 194 | size_t uname_release_len, i; | 205 | size_t uname_release_len, i; |
512 | 195 | 206 | ||
513 | 207 | /* If we detect EFI firmware, bail out early here */ | ||
514 | 208 | if (di_system_is_efi()) | ||
515 | 209 | return "efi"; | ||
516 | 210 | |||
517 | 196 | /* Attempt to determine subarch based on kernel release version */ | 211 | /* Attempt to determine subarch based on kernel release version */ |
518 | 197 | uname(&sysinfo); | 212 | uname(&sysinfo); |
519 | 198 | uname_release_len = strlen(sysinfo.release); | 213 | uname_release_len = strlen(sysinfo.release); |
520 | 199 | 214 | ||
521 | === added symlink 'src/system/subarch-mips64el-linux.c' | |||
522 | === target is u'subarch-mips-linux.c' |
LGTM, but it will need some other rebuilds to fully take effect (libd-i has multiple reverse-depends).
I'm merging, and I'll verify that the other bits still build correctly.