[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/mfgtools][debian/master] 4 commits: New upstream version 1.4.72

[Henry-Nicolas Tourneur]

Henry-Nicolas Tourneur pushed to branch debian/master at Debian On Mobile / mfgtools


Commits:
4ecbacae by Henry-Nicolas Tourneur at 2021-01-17T15:24:37+00:00
New upstream version 1.4.72
- - - - -
23dfae15 by Henry-Nicolas Tourneur at 2021-01-17T15:24:42+00:00
Update upstream source from tag 'upstream/1.4.72'

Update to upstream version '1.4.72'
with Debian dir d53a002cbbdc4fb44b1307c30c20d044a01e6ed5
- - - - -
579507e7 by Henry-Nicolas Tourneur at 2021-01-17T15:25:03+00:00
d/changelog: new upstream version

- - - - -
5b07796a by Henry-Nicolas Tourneur at 2021-01-17T15:27:05+00:00
Update Standard-Version to 4.5.1

- - - - -


4 changed files:

- debian/changelog
- debian/control
- libuuu/fastboot.cpp
- libuuu/sparse.cpp


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+mfgtools (1.4.72-1) unstable; urgency=medium
+
+  * New upstream version 1.4.72
+  * Set Standard-Version to 4.5.1, no changes needed.
+
+ -- Henry-Nicolas Tourneur <debian at nilux.be>  Sun, 17 Jan 2021 15:24:50 +0000
+
 mfgtools (1.4.69-1) unstable; urgency=medium
 
   * d/patches: remove 001_cmakelist_so+bhlc+repro.patch, merged upstream


=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Build-Depends:
  libssl-dev,
  pkg-config,
  zlib1g-dev,
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://github.com/NXPmicro/mfgtools
 Vcs-Git: https://salsa.debian.org/DebianOnMobile-team/mfgtools.git


=====================================
libuuu/fastboot.cpp
=====================================
@@ -670,6 +670,7 @@ int FBFlashCmd::run(CmdCtx *ctx)
 		for(size_t nblk=0; nblk < pfile->total_chunks && pos <= pdata->size(); nblk++)
 		{
 			pdata->request_data(pos+sizeof(chunk_header_t)+sizeof(sparse_header));
+			size_t oldpos = pos;
 			pheader = SparseFile::get_next_chunk(pdata->data(), pos);
 			pdata->request_data(pos);
 
@@ -678,6 +679,32 @@ int FBFlashCmd::run(CmdCtx *ctx)
 			{
 				startblock += pheader->chunk_sz;
 			}
+			else if (sz == 0)
+			{
+				//whole chuck have not push into data.
+				if (flash(&fb, sf.m_data.data(), sf.m_data.size()))
+					return -1;
+
+				sf.init_header(pfile->blk_sz, max / pfile->blk_sz);
+
+				chunk_header_t ct;
+				ct.chunk_type = CHUNK_TYPE_DONT_CARE;
+				ct.chunk_sz = startblock;
+				ct.reserved1 = 0;
+				ct.total_sz = sizeof(ct);
+
+				sz = sf.push_one_chuck(&ct, nullptr);
+
+				/*
+					roll back pos to previous failure chunck and let it push again into new sparse file.
+					can't push it here because next chuck may big size chuck and need split as below else logic.
+				*/
+				pos = oldpos;
+				uuu_notify nt;
+				nt.type = uuu_notify::NOTIFY_TRANS_POS;
+				nt.total = startblock;
+				call_notify(nt);
+			}
 			else
 			{
 				size_t off = ((uint8_t*)pheader) - pdata->data() + sz + sizeof(chunk_header_t);


=====================================
libuuu/sparse.cpp
=====================================
@@ -181,15 +181,20 @@ size_t SparseFile::push_one_chuck(chunk_header_t *p, void *data)
 
 	if (p->total_sz + m_data.size() > m_max_size)
 	{
-		size_t blk = (m_max_size - m_data.size())/pheader->blk_sz;
-		if (blk < 2)
-			return 0;
+		if (p->chunk_type == CHUNK_TYPE_RAW)
+		{
+			size_t blk = (m_max_size - m_data.size()) / pheader->blk_sz;
+			if (blk < 2)
+				return 0;
 
-		blk -= 2;
+			blk -= 2;
 
-		cheader.chunk_sz = blk;
-		sz = blk * pheader->blk_sz;
-		cheader.total_sz = sizeof(chunk_header_t) + sz;
+			cheader.chunk_sz = blk;
+			sz = blk * pheader->blk_sz;
+			cheader.total_sz = sizeof(chunk_header_t) + sz;
+		}
+		else
+			return 0;
 	}
 
 	push(&cheader, sizeof(chunk_header));



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/mfgtools/-/compare/ea8d1013c5c95163683801d97c43b6e3b7321abb...5b07796abb6956c89f6fad83020eade08c177131

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/mfgtools/-/compare/ea8d1013c5c95163683801d97c43b6e3b7321abb...5b07796abb6956c89f6fad83020eade08c177131
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20210117/aa3ecbbe/attachment-0001.html>