[FE training-materials-updates] Recompress data files with xz instead of lzma

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=88004d6e503356203cfcdc9aa48cdd88f491243f

>---------------------------------------------------------------

commit 88004d6e503356203cfcdc9aa48cdd88f491243f
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Thu Oct 4 11:27:49 2012 +0200

    Recompress data files with xz instead of lzma


>---------------------------------------------------------------

88004d6e503356203cfcdc9aa48cdd88f491243f
 gen-lab-archive                                    |   12 ++++++------
 lab-data/intro/commands.tar.lzma                   |  Bin 133866 -> 0 bytes
 lab-data/intro/commands.tar.xz                     |  Bin 0 -> 133960 bytes
 lab-data/intro/files.tar.lzma                      |  Bin 136565 -> 0 bytes
 lab-data/intro/files.tar.xz                        |  Bin 0 -> 136652 bytes
 lab-data/intro/text.tar.lzma                       |  Bin 13745 -> 0 bytes
 lab-data/intro/text.tar.xz                         |  Bin 0 -> 13796 bytes
 lab-data/linux/block/nfsroot.tar.lzma              |  Bin 444238 -> 0 bytes
 lab-data/linux/block/nfsroot.tar.xz                |  Bin 0 -> 444352 bytes
 lab-data/linux/character/nfsroot.tar.lzma          |  Bin 648060 -> 0 bytes
 lab-data/linux/character/nfsroot.tar.xz            |  Bin 0 -> 645396 bytes
 lab-data/linux/debugging/nfsroot.tar.lzma          |  Bin 148276 -> 0 bytes
 lab-data/linux/debugging/nfsroot.tar.xz            |  Bin 0 -> 148288 bytes
 lab-data/linux/git.tar.lzma                        |  Bin 114 -> 0 bytes
 lab-data/linux/git.tar.xz                          |  Bin 0 -> 164 bytes
 lab-data/linux/modules/nfsroot.tar.lzma            |  Bin 147546 -> 0 bytes
 lab-data/linux/modules/nfsroot.tar.xz              |  Bin 0 -> 147608 bytes
 .../fs/data/{rootfs.tar.lzma => rootfs.tar.xz}     |  Bin 330168 -> 330168 bytes
 18 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gen-lab-archive b/gen-lab-archive
index 5b77a72..c305e65 100755
--- a/gen-lab-archive
+++ b/gen-lab-archive
@@ -8,7 +8,7 @@ GIT=/usr/bin/git
 RM=/bin/rm
 FIND=/usr/bin/find
 TAR=/bin/tar
-UNLZMA=/usr/bin/unlzma
+UNLZMA=/usr/bin/unxz
 DIRNAME=/usr/bin/dirname
 RSYNC=/usr/bin/rsync
 SUDO=/usr/bin/sudo
@@ -32,17 +32,17 @@ $RSYNC --exclude=.git -a --delete lab-data/ felabs/
 
 # Uncompress compressed files
 
-$ECHO "Extracting tar.lzma archives (root permissions needed for device files)"
+$ECHO "Extracting tar.xz archives (root permissions needed for device files)"
 
-for f in `$FIND felabs -name "*.tar.lzma"`; do
-	$SUDO $TAR -C `dirname $f` --lzma -xf $f
+for f in `$FIND felabs -name "*.tar.xz"`; do
+	$SUDO $TAR -C `dirname $f` -Jxf $f
 	$RM $f
 done
 
 $SUDO $CHOWN -R $USER.$USER felabs
 
-$ECHO "Uncompressing other .lzma files"
-$FIND felabs -name "*.lzma" -exec $UNLZMA {} ';' 
+$ECHO "Uncompressing other .xz files"
+$FIND felabs -name "*.xz" -exec $UNXZ {} ';' 
 
 # Create the final archive
 
diff --git a/lab-data/intro/commands.tar.lzma b/lab-data/intro/commands.tar.lzma
deleted file mode 100644
index 16222fb..0000000
Binary files a/lab-data/intro/commands.tar.lzma and /dev/null differ
diff --git a/lab-data/intro/commands.tar.xz b/lab-data/intro/commands.tar.xz
new file mode 100644
index 0000000..d24b7e0
Binary files /dev/null and b/lab-data/intro/commands.tar.xz differ
diff --git a/lab-data/intro/files.tar.lzma b/lab-data/intro/files.tar.lzma
deleted file mode 100644
index 056788c..0000000
Binary files a/lab-data/intro/files.tar.lzma and /dev/null differ
diff --git a/lab-data/intro/files.tar.xz b/lab-data/intro/files.tar.xz
new file mode 100644
index 0000000..b766d10
Binary files /dev/null and b/lab-data/intro/files.tar.xz differ
diff --git a/lab-data/intro/text.tar.lzma b/lab-data/intro/text.tar.lzma
deleted file mode 100644
index 5749669..0000000
Binary files a/lab-data/intro/text.tar.lzma and /dev/null differ
diff --git a/lab-data/intro/text.tar.xz b/lab-data/intro/text.tar.xz
new file mode 100644
index 0000000..8fd8ca0
Binary files /dev/null and b/lab-data/intro/text.tar.xz differ
diff --git a/lab-data/linux/block/nfsroot.tar.lzma b/lab-data/linux/block/nfsroot.tar.lzma
deleted file mode 100644
index c01ab7a..0000000
Binary files a/lab-data/linux/block/nfsroot.tar.lzma and /dev/null differ
diff --git a/lab-data/linux/block/nfsroot.tar.xz b/lab-data/linux/block/nfsroot.tar.xz
new file mode 100644
index 0000000..9326223
Binary files /dev/null and b/lab-data/linux/block/nfsroot.tar.xz differ
diff --git a/lab-data/linux/character/nfsroot.tar.lzma b/lab-data/linux/character/nfsroot.tar.lzma
deleted file mode 100644
index e360481..0000000
Binary files a/lab-data/linux/character/nfsroot.tar.lzma and /dev/null differ
diff --git a/lab-data/linux/character/nfsroot.tar.xz b/lab-data/linux/character/nfsroot.tar.xz
new file mode 100644
index 0000000..e9e9e79
Binary files /dev/null and b/lab-data/linux/character/nfsroot.tar.xz differ
diff --git a/lab-data/linux/debugging/nfsroot.tar.lzma b/lab-data/linux/debugging/nfsroot.tar.lzma
deleted file mode 100644
index 6a7854f..0000000
Binary files a/lab-data/linux/debugging/nfsroot.tar.lzma and /dev/null differ
diff --git a/lab-data/linux/debugging/nfsroot.tar.xz b/lab-data/linux/debugging/nfsroot.tar.xz
new file mode 100644
index 0000000..60e1ea0
Binary files /dev/null and b/lab-data/linux/debugging/nfsroot.tar.xz differ
diff --git a/lab-data/linux/git.tar.lzma b/lab-data/linux/git.tar.lzma
deleted file mode 100644
index 606b6bb..0000000
Binary files a/lab-data/linux/git.tar.lzma and /dev/null differ
diff --git a/lab-data/linux/git.tar.xz b/lab-data/linux/git.tar.xz
new file mode 100644
index 0000000..d632efd
Binary files /dev/null and b/lab-data/linux/git.tar.xz differ
diff --git a/lab-data/linux/modules/nfsroot.tar.lzma b/lab-data/linux/modules/nfsroot.tar.lzma
deleted file mode 100644
index fc49a5c..0000000
Binary files a/lab-data/linux/modules/nfsroot.tar.lzma and /dev/null differ
diff --git a/lab-data/linux/modules/nfsroot.tar.xz b/lab-data/linux/modules/nfsroot.tar.xz
new file mode 100644
index 0000000..d5ebd7d
Binary files /dev/null and b/lab-data/linux/modules/nfsroot.tar.xz differ
diff --git a/lab-data/sysdev/fs/data/rootfs.tar.lzma b/lab-data/sysdev/fs/data/rootfs.tar.xz
similarity index 99%
rename from lab-data/sysdev/fs/data/rootfs.tar.lzma
rename to lab-data/sysdev/fs/data/rootfs.tar.xz
index 8d613bd..43ac4b4 100644
Binary files a/lab-data/sysdev/fs/data/rootfs.tar.lzma and b/lab-data/sysdev/fs/data/rootfs.tar.xz differ