From 9b9195c2f960d13d93abdcbe68e32d65e0ec9d10 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Sun, 17 Feb 2013 08:57:16 -0600
Subject: [PATCH] prep for minimal images
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
base_image.sh | 14 ++++++--------
scripts/chroot.sh | 4 ++--
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/base_image.sh b/base_image.sh
index a0b5a8bcd..cd5f4ce0b 100755
--- a/base_image.sh
+++ b/base_image.sh
@@ -187,18 +187,16 @@ else
echo "Starting Compression"
cd ${DIR}/deploy/
+ tar cvf ${export_filename}.tar ./${export_filename}
+
if [ -f ${DIR}/release ] ; then
- tar cvf ${export_filename}.tar ./${export_filename}
- xz -z -7 -v ${export_filename}.tar
+ echo "xz -z -7 -v ${export_filename}.tar>" >> /mnt/farm/testing/pending/compress.txt
if [ "x${SYST}" == "x${RELEASE_HOST}" ] ; then
if [ -d /mnt/farm/testing/pending/ ] ; then
- cp -v ${export_filename}.tar.xz /mnt/farm/testing/pending/${export_filename}.tar.xz
+ cp -v ${export_filename}.tar /mnt/farm/testing/pending/${export_filename}.tar
fi
fi
-
- else
- tar cvf ${export_filename}.tar ./${export_filename}
fi
cd ${DIR}/
fi
@@ -254,7 +252,7 @@ function wheezy_release {
reset_vars
DIST=wheezy
- EXTRA=",u-boot-tools,${DEBIAN_ONLY}"
+ EXTRA=",u-boot-tools,${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
FIXUPSCRIPT="fixup-debian-base.sh"
MIRROR="${MIRROR_DEB}"
@@ -269,7 +267,7 @@ function sid_release {
reset_vars
DIST=sid
- EXTRA=",u-boot-tools,${DEBIAN_ONLY}"
+ EXTRA=",u-boot-tools,${DEBIAN_ONLY},lowpan-tools"
USER_LOGIN="debian"
FIXUPSCRIPT="fixup-debian-base.sh"
MIRROR="${MIRROR_DEB}"
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 4c8f1cef4..4be4674b9 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -512,9 +512,9 @@ sudo cp -v ${DIR}/tools/setup_sdcard.sh ${DIR}/deploy/${export_filename}/
if [ "x${chroot_ENABLE_DEB_SRC}" == "xenable" ] ; then
cd ${tempdir}/tmp/pkg_src/
- sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${dpkg_arch}-rootfs-${distro}-${release}-src.tar .
+ sudo LANG=C tar --numeric-owner -cf ${DIR}/deploy/${dpkg_arch}-rootfs-${distro}-${release}-${time}-src.tar .
cd ${tempdir}
- ls -lh ${DIR}/deploy/${dpkg_arch}-rootfs-${distro}-${release}-src.tar
+ ls -lh ${DIR}/deploy/${dpkg_arch}-rootfs-${distro}-${release}-${time}-src.tar
sudo rm -rf ${tempdir}/tmp/pkg_src/ || true
report_size
fi
--
GitLab