From patchwork Mon Aug 19 07:40:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 19287 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC0322469E for ; Mon, 19 Aug 2013 07:40:41 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id cd7sf3727652qab.1 for ; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=zO1M+8F1KRwHDprwuaSWN43fGaNcCk1fl2HEOPiM/G8=; b=L2gwsfH0gIm9kPQDaF7r+IIrzwz2xgfzPawnX+lVlyKKHmj8grRlQhbIwSWsWuL0o0 oA8nsw6Tv/PUqxvERxP8sCddhycjQ6cU2ZtzQz4WkCKh9RMRE5BQzyDbe9eOi4czt/2D 7BlsGWxK42aA/95fj0WiPqlynhMR0WGVl/6K9C9P3kNClDH6TnSAVs2+3vkc0qnF1+Na YNLil1SIHEU6TQt75NfvwPAF7grQ6VcW6zfhlbWKy24fPNegOE2cQ591d8ejnAFZFAec 1zQ4z0K9JtGVzrgkvdJO2rU7ELh1ZE0VFcvVN2DL0yD/iR9ByslBKDad5v681tD17rzM 3tbg== X-Received: by 10.236.45.102 with SMTP id o66mr1491552yhb.47.1376898041341; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.98.198 with SMTP id ek6ls1707962qeb.45.gmail; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) X-Received: by 10.52.165.45 with SMTP id yv13mr10297907vdb.1.1376898041189; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id z6si2133760vcu.70.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Aug 2013 00:40:41 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz10so2829479veb.3 for ; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) X-Gm-Message-State: ALoCoQll1j40QhfEbcCtC7IPaQ6aOrCcD/2oe+4mdbseVmnGsA9V/0+kqpSqx8jAT9KJ9lbEj3Wm X-Received: by 10.220.145.132 with SMTP id d4mr15414846vcv.9.1376898041061; Mon, 19 Aug 2013 00:40:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp81777vcz; Mon, 19 Aug 2013 00:40:40 -0700 (PDT) X-Received: by 10.180.80.229 with SMTP id u5mr7273996wix.59.1376898039949; Mon, 19 Aug 2013 00:40:39 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id gg5si2090878wib.37.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 19 Aug 2013 00:40:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VBK4t-0005KM-AS for ; Mon, 19 Aug 2013 07:40:39 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 42278E0818 for ; Mon, 19 Aug 2013 07:40:39 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 638 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 638: Revert Fedora support - regression Message-Id: <20130819074039.11829.36311.launchpad@ackee.canonical.com> Date: Mon, 19 Aug 2013 07:40:39 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16723"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: dfe443798538d27b85998daa18291496f1e826cd X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , ------------------------------------------------------------ revno: 638 committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Mon 2013-08-19 10:39:34 +0300 message: Revert Fedora support - regression modified: linaro-hwpack-install linaro-media-create linaro_image_tools/media_create/chroot_utils.py linaro_image_tools/media_create/rootfs.py linaro_image_tools/media_create/tests/test_media_create.py linaro_image_tools/media_create/unpack_binary_tarball.py linaro_image_tools/utils.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro-hwpack-install' --- linaro-hwpack-install 2013-08-08 07:44:38 +0000 +++ linaro-hwpack-install 2013-08-19 07:39:34 +0000 @@ -1,7 +1,8 @@ #!/bin/sh # linaro-hwpack-install - Install a Linaro Hardware Pack. -# This script is meant to run inside a chroot. It must not depend on anything -# that's not in there. +# This script is meant to run inside a chroot containing nothing other than +# ubuntu-minimal, so it must not depend on anything that's not in +# there. # TODO: When upgrading to a newer hwpack, make sure packages and apt sources # that are no longer needed are removed. @@ -43,7 +44,6 @@ SUPPORTED_FORMATS="1.0 2.0 3.0" # A space-separated list of hwpack formats. FLASH_KERNEL_SKIP="true" export FLASH_KERNEL_SKIP # skip attempting to run flash-kernel-hooks -DISTRIBUTION=`grep '^ID=' /etc/os-release | sed 's/ID=//'` sudo="sudo" if [ $(id -u) -eq 0 ]; then @@ -129,7 +129,7 @@ "Try using a newer version of $(basename $0)." # Check the architecture of the hwpack matches that of the host system. - if [ "x$EXTRACT_KERNEL_ONLY" = "xno" -a "$DISTRIBUTION" = "ubuntu" ]; then + if [ "x$EXTRACT_KERNEL_ONLY" = "xno" ]; then # TODO: create a generic way to identify the architecture, without depending on dpkg [ "$HWPACK_ARCH" = `dpkg --print-architecture` ] || \ die "Hardware pack architecture ($HWPACK_ARCH) does not match the host's architecture" @@ -269,49 +269,14 @@ # We assume the hwpack is always available at the rootfs ROOTFS_DIR=$(dirname $HWPACK_TARBALL) - DEB_DIR="${TEMP_DIR}/extracted" - mkdir -p ${DEB_DIR} - ls ${HWPACK_DIR}/pkgs/linux-[ih]*.deb | while read pkg; do echo "Extracting package `basename $pkg`" - if [ "$DISTRIBUTION" = "ubuntu" ]; then - dpkg-deb -x ${pkg} $ROOTFS_DIR - elif [ "$DISTRIBUTION" = "fedora" ]; then - ar x ${pkg} - tar -xf data.tar.* -C ${DEB_DIR} - rm -f debian-binary control.tar.gz data.tar.* - fi - done - - ls ${HWPACK_DIR}/pkgs/arndale-pre-boot_*.deb | while read pkg; do - echo "Extracting package `basename $pkg`" - if [ "$DISTRIBUTION" = "ubuntu" ]; then - dpkg-deb -x ${pkg} $ROOTFS_DIR - elif [ "$DISTRIBUTION" = "fedora" ]; then - ar x ${pkg} - tar -xf data.tar.* -C ${DEB_DIR} - rm -f debian-binary control.tar.gz data.tar.* - fi - done - - if [ "$DISTRIBUTION" = "fedora" ]; then - cp -a ${DEB_DIR}/boot/* /boot/ - cp -a ${DEB_DIR}/lib/modules/* /usr/lib/modules/ - cp -a ${DEB_DIR}/lib/firmware/* /usr/lib/firmware/ - fi - - if [ -d "${HWPACK_DIR}/u_boot" ]; then - cp -a ${HWPACK_DIR}/u_boot/usr/lib/* /usr/lib - fi - - if [ -d "${HWPACK_DIR}/uefi" ]; then - cp -a ${HWPACK_DIR}/uefi/usr/lib/* /usr/lib - fi + dpkg-deb -x ${pkg} $ROOTFS_DIR + done # manually generate modules.dep ls $ROOTFS_DIR/lib/modules | while read kernel; do depmod -b $ROOTFS_DIR ${kernel} || true - [ "$DISTRIBUTION" = "fedora" ] && dracut /boot/initrd.img-${kernel} ${kernel} done; } @@ -319,7 +284,7 @@ # Ensure our temp dir and apt sources are removed. echo -n "Cleaning up ..." rm -rf $TEMP_DIR - if [ "x$EXTRACT_KERNEL_ONLY" = "xno" -a "$DISTRIBUTION" = "ubuntu" ]; then + if [ "x$EXTRACT_KERNEL_ONLY" = "xno" ]; then rm -f /usr/sbin/policy-rc.d mv -f /sbin/start-stop-daemon.REAL /sbin/start-stop-daemon if [ -x /sbin/initctl.REAL ]; then @@ -353,7 +318,7 @@ setup_hwpack # In case we only care about the kernel, don't mess up with the system -if [ "x$EXTRACT_KERNEL_ONLY" = "xno" -a "$DISTRIBUTION" = "ubuntu" ]; then +if [ "x$EXTRACT_KERNEL_ONLY" = "xno" ]; then setup_apt_sources setup_ubuntu_rootfs install_deb_packages === modified file 'linaro-media-create' --- linaro-media-create 2013-08-17 05:10:14 +0000 +++ linaro-media-create 2013-08-19 07:39:34 +0000 @@ -181,6 +181,12 @@ # The binary image is in the new live format. filesystem_dir = 'binary/boot/filesystem.dir' + # if not a debian compatible system, just extract the kernel packages + extract_kpkgs = False + if not path_in_tarfile_exists( + os.path.join(filesystem_dir, 'etc', 'debian_version'), args.binary): + extract_kpkgs = True + ROOTFS_DIR = os.path.join(BIN_DIR, filesystem_dir) try: @@ -203,24 +209,6 @@ unpack_binary_tarball(args.binary, BIN_DIR) - # if compatible system, extract all packages - os_release_id = 'linux' - os_release_file = '%s/etc/os-release' % ROOTFS_DIR - if os.path.exists(os_release_file): - for line in open(os_release_file): - if line.startswith('ID='): - os_release_id = line[(len('ID=')):] - os_release_id = os_release_id.strip('\"\n') - break - - if os_release_id == 'debian' or os_release_id == 'ubuntu' or \ - os.path.exists('%s/etc/debian_version' % ROOTFS_DIR): - extract_kpkgs = False - elif os_release_id == 'fedora': - extract_kpkgs = False - else: - extract_kpkgs = True - hwpacks = args.hwpacks lmc_dir = os.path.dirname(__file__) if lmc_dir == '': @@ -275,6 +263,6 @@ populate_rootfs(ROOTFS_DIR, ROOT_DISK, root_partition, args.rootfs, rootfs_id, create_swap, str(args.swap_file), board_config.mmc_device_id, board_config.mmc_part_offset, - os_release_id, board_config) + board_config) logger.info("Done creating Linaro image on %s" % media.path) === modified file 'linaro_image_tools/media_create/chroot_utils.py' --- linaro_image_tools/media_create/chroot_utils.py 2013-08-08 07:44:38 +0000 +++ linaro_image_tools/media_create/chroot_utils.py 2013-08-19 07:39:34 +0000 @@ -105,7 +105,7 @@ print "Installing (linaro-hwpack-install) %s in target rootfs." % ( hwpack_basename) - # Get information required by linaro-hwpack-install + # Get infromation required by linaro-hwpack-install with HardwarepackHandler([hwpack_file]) as hwpack: version, _ = hwpack.get_field("version") architecture, _ = hwpack.get_field("architecture") === modified file 'linaro_image_tools/media_create/rootfs.py' --- linaro_image_tools/media_create/rootfs.py 2013-08-08 07:44:38 +0000 +++ linaro_image_tools/media_create/rootfs.py 2013-08-19 07:39:34 +0000 @@ -43,8 +43,7 @@ def populate_rootfs(content_dir, root_disk, partition, rootfs_type, rootfs_id, should_create_swap, swap_size, - mmc_device_id, partition_offset, os_release_id, - board_config=None): + mmc_device_id, partition_offset, board_config=None): """Populate the rootfs and make the necessary tweaks to make it usable. This consists of: @@ -87,14 +86,13 @@ append_to_fstab(root_disk, fstab_additions) - if os_release_id == 'debian' or os_release_id == 'ubuntu': - print "\nCreating /etc/flash-kernel.conf\n" - create_flash_kernel_config( - root_disk, mmc_device_id, 1 + partition_offset) + print "\nCreating /etc/flash-kernel.conf\n" + create_flash_kernel_config( + root_disk, mmc_device_id, 1 + partition_offset) - if board_config is not None: - print "\nUpdating /etc/network/interfaces\n" - update_network_interfaces(root_disk, board_config) + if board_config is not None: + print "\nUpdating /etc/network/interfaces\n" + update_network_interfaces(root_disk, board_config) def update_network_interfaces(root_disk, board_config): @@ -138,8 +136,7 @@ not be world-readable. """ p = cmd_runner.run( - ['find', directory, '-maxdepth', '1', '-mindepth', '1', - '!', '-name', 'lost+found'], + ['find', directory, '-maxdepth', '1', '-mindepth', '1'], stdout=subprocess.PIPE, as_root=True) stdout, _ = p.communicate() return stdout.split() === modified file 'linaro_image_tools/media_create/tests/test_media_create.py' --- linaro_image_tools/media_create/tests/test_media_create.py 2013-08-17 05:05:41 +0000 +++ linaro_image_tools/media_create/tests/test_media_create.py 2013-08-19 07:39:34 +0000 @@ -3673,8 +3673,7 @@ populate_rootfs( contents_dir, root_disk, partition='/dev/rootfs', rootfs_type='ext3', rootfs_id='UUID=uuid', should_create_swap=True, - swap_size=100, mmc_device_id=0, partition_offset=0, - os_release_id='ubuntu', board_config=None) + swap_size=100, mmc_device_id=0, partition_offset=0) self.assertEqual( ['UUID=uuid / ext3 errors=remount-ro 0 1', === modified file 'linaro_image_tools/media_create/unpack_binary_tarball.py' --- linaro_image_tools/media_create/unpack_binary_tarball.py 2013-08-08 07:44:38 +0000 +++ linaro_image_tools/media_create/unpack_binary_tarball.py 2013-08-19 07:39:34 +0000 @@ -29,11 +29,8 @@ def unpack_binary_tarball(tarball, unpack_dir, as_root=True): - extract_opt = '-xf' - if tarball.endswith('.xz'): - extract_opt = '-Jxf' proc = cmd_runner.run( - ['tar', '--numeric-owner', '-C', unpack_dir, extract_opt, tarball], + ['tar', '--numeric-owner', '-C', unpack_dir, '-xf', tarball], as_root=as_root) proc.wait() return proc.returncode === modified file 'linaro_image_tools/utils.py' --- linaro_image_tools/utils.py 2013-08-08 07:44:38 +0000 +++ linaro_image_tools/utils.py 2013-08-19 07:39:34 +0000 @@ -89,21 +89,11 @@ def path_in_tarfile_exists(path, tar_file): exists = True try: - tarinfo = tarfile.open(tar_file, 'r:*') + tarinfo = tarfile.open(tar_file, 'r:gz') tarinfo.getmember(path) tarinfo.close() except KeyError: exists = False - except (tarfile.ReadError, tarfile.CompressionError): - exists = False - # Fallback to tar command - cmd = ['tar', '-tf', tar_file, '--wildcards', '*' + path] - proc = cmd_runner.run(cmd, - stdout=open('/dev/null', 'w'), - stderr=open('/dev/null', 'w')) - proc.wait() - if proc.returncode == 0: - exists = True finally: return exists