[OE-core] [thud] Backport "package_manager.py: Use data.tar.xz for ipkg too"

[Angus Lees]

Please cherry-pick c09a22c421a57701f6b943eb50b9bae1545e5b39
 onto thud release branch.  (Note warrior already has this commit)

The fix should also be applied to sumo, if we're still making changes
there.  (Any branch that includes b95b6ba1a2959e2294a8848fa35f20163388eb06)

-- 
Thanks,
 - Gus
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] Revert "wic: Set a miniumum FAT16 volume size."

[Angus Lees]

ping?

On Thu, 21 Mar 2019 at 16:49, Angus Lees  wrote:

> This reverts commit f7dfb4d43247d3c13a4e0a3853007d63b9512b83.
>
> FAT16 volumes do not have a minimum size of 8250 blocks
> (== slightly over 4MB).  Exhibit A: floppy disks.
>
> The original commit message suggests this was a workaround for a bug in
> parted - in which case we should fix it there, or use the wic
> `--fixed-size` option to pass down an enforced minimum from a more
> context-aware point in the callstack.
> ---
> (This should also be backported to sumo)
>
>  scripts/lib/wic/partition.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
> index 3fe5c4e26c..2178321404 100644
> --- a/scripts/lib/wic/partition.py
> +++ b/scripts/lib/wic/partition.py
> @@ -322,7 +322,7 @@ class Partition():
>
>  dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
>  (label_str, self.fsuuid, size_str, extraopts, rootfs,
> - max(8250, rootfs_size))
> + rootfs_size)
>  exec_native_cmd(dosfs_cmd, native_sysroot)
>
>  mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
> --
> 2.11.0
>
>

-- 
 - Gus
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] Revert "wic: Set a miniumum FAT16 volume size."

[Angus Lees]

This reverts commit f7dfb4d43247d3c13a4e0a3853007d63b9512b83.

FAT16 volumes do not have a minimum size of 8250 blocks
(== slightly over 4MB).  Exhibit A: floppy disks.

The original commit message suggests this was a workaround for a bug in
parted - in which case we should fix it there, or use the wic
`--fixed-size` option to pass down an enforced minimum from a more
context-aware point in the callstack.
---
(This should also be backported to sumo)

 scripts/lib/wic/partition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 3fe5c4e26c..2178321404 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -322,7 +322,7 @@ class Partition():
 
 dosfs_cmd = "mkdosfs %s -i %s %s %s -C %s %d" % \
 (label_str, self.fsuuid, size_str, extraopts, rootfs,
- max(8250, rootfs_size))
+ rootfs_size)
 exec_native_cmd(dosfs_cmd, native_sysroot)
 
 mcopy_cmd = "mcopy -i %s -s %s/* ::/" % (rootfs, rootfs_dir)
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] package_manager.py: Use data.tar.xz for ipkg too

[Angus Lees]

Commit b95b6ba1a2959e2294a8848fa35f20163388eb06 changed package_ipk.bbclass
to xz when building packages.  This updates OpkgDpkgPM.extract() accordingly.

Signed-off-by: Angus Lees 
---

This should also be backported to sumo.

>From a quick grep, I note recipes-devtools/build-compare probably also
needs updating.  I have not done so in this patch, because I don't
(knowingly) use that tool and have no idea how to test it.

 meta/lib/oe/package_manager.py | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 2d8aeba037..6b45f1b2d4 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1030,10 +1030,7 @@ class OpkgDpkgPM(PackageManager):
 tmp_dir = tempfile.mkdtemp()
 current_dir = os.getcwd()
 os.chdir(tmp_dir)
-if self.d.getVar('IMAGE_PKGTYPE') == 'deb':
-data_tar = 'data.tar.xz'
-else:
-data_tar = 'data.tar.gz'
+data_tar = 'data.tar.xz'
 
 try:
 cmd = [ar_cmd, 'x', pkg_path]
@@ -1432,7 +1429,7 @@ class OpkgPM(OpkgDpkgPM):
  "trying to extract the package."  % pkg)
 
 tmp_dir = super(OpkgPM, self).extract(pkg, pkg_info)
-bb.utils.remove(os.path.join(tmp_dir, "data.tar.gz"))
+bb.utils.remove(os.path.join(tmp_dir, "data.tar.xz"))
 
 return tmp_dir
 
-- 
2.11.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core