97c01e48ed
Currently we have all our elements and library files in a top-level directory and install them into <root>/share/diskimage-builder/[elements|lib] (where root is either / or the root of a virtualenv). The problem with this is that editable/development installs (pip -e) do *not* install data_files. Thus we have no canonical location to look for elements -- leading to the various odd things we do such as a whole bunch of guessing at the top of disk-image-create and having a special test-loader in tests/test_elements.py so we can run python unit tests on those elements that have it. data_files is really the wrong thing to use for what are essentially assets of the program. data_files install works well for things like config-files, init.d files or dropping documentation files. By moving the elements under the diskimage_builder package, we always know where they are relative to where we import from. In fact, pkg_resources has an api for this which we wrap in the new diskimage_builder/paths.py helper [1]. We use this helper to find the correct path in the couple of places we need to find the base-elements dir, and for the paths to import the library shell functions. Elements such as svc-map and pkg-map include python unit-tests, which we do not need tests/test_elements.py to special-case load any more. They just get found automatically by the normal subunit loader. I have a follow-on change (I69ca3d26fede0506a6353c077c69f735c8d84d28) to move disk-image-create to a regular python entry-point. Unfortunately, this has to move to work with setuptools. You'd think a symlink under diskimage_builder/[elements|lib] would work, but it doesn't. [1] this API handles stuff like getting files out of .zip archive modules, which we don't do. Essentially for us it's returning __file__. Change-Id: I5e3e3c97f385b1a4ff2031a161a55b231895df5b
89 lines
2.9 KiB
Bash
Executable File
89 lines
2.9 KiB
Bash
Executable File
#!/bin/bash
|
|
#
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
if [ -f ${TARGET_ROOT}/.extra_settings ] ; then
|
|
. ${TARGET_ROOT}/.extra_settings
|
|
fi
|
|
|
|
[ -n "$DISTRO_NAME" ]
|
|
[ -n "$DIB_RELEASE" ]
|
|
[ -n "$DIB_DISTRIBUTION_MIRROR" ]
|
|
|
|
if [ $DISTRO_NAME = 'ubuntu' ] ; then
|
|
KERNEL='generic'
|
|
else
|
|
case $ARCH in
|
|
amd64) KERNEL='amd64' ;;
|
|
i386) KERNEL='686' ;;
|
|
arm7)
|
|
[ -n "$DIB_ARM_KERNEL" ]
|
|
KERNEL="$DIB_ARM_KERNEL"
|
|
;;
|
|
esac
|
|
fi
|
|
KERNEL_PACKAGE="linux-image-$KERNEL"
|
|
|
|
DIB_DEBIAN_COMPONENTS=${DIB_DEBIAN_COMPONENTS:-main}
|
|
DIB_DEBOOTSTRAP_EXTRA_ARGS=${DIB_DEBOOTSTRAP_EXTRA_ARGS:-}
|
|
DEBOOTSTRAP_TARBALL=$DIB_IMAGE_CACHE/debootstrap-${DISTRO_NAME}-${DIB_RELEASE}-${ARCH}-${KERNEL}.tar.gz
|
|
http_proxy=${http_proxy:-}
|
|
no_proxy=${no_proxy:-}
|
|
|
|
if [ -n "$DIB_OFFLINE" -o -n "${DIB_DEBIAN_USE_DEBOOTSTRAP_CACHE:-}" ] && [ -f $DEBOOTSTRAP_TARBALL ] ; then
|
|
echo $DEBOOTSTRAP_TARBALL found in cache. Using.
|
|
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DEBOOTSTRAP_TARBALL
|
|
else
|
|
|
|
KEYRING_OPT=
|
|
if [ -n "${DIB_APT_KEYRING:-${DIB_DEBIAN_KEYRING:-}}" ] ; then
|
|
KEYRING_OPT="--keyring=${DIB_APT_KEYRING:-${DIB_DEBIAN_KEYRING:-}}"
|
|
fi
|
|
|
|
# Have to --include=python because of dib-run-parts
|
|
# Have to --include=sudo for pre-install.d use of sudoers files
|
|
# Have to --include=busybox because initramfs needs it
|
|
sudo sh -c "http_proxy=$http_proxy no_proxy=$no_proxy debootstrap --verbose \
|
|
--variant=minbase \
|
|
--include=python,sudo,busybox,$KERNEL_PACKAGE \
|
|
--components=${DIB_DEBIAN_COMPONENTS} \
|
|
--arch=${ARCH} \
|
|
$KEYRING_OPT \
|
|
$DIB_DEBOOTSTRAP_EXTRA_ARGS \
|
|
$DIB_RELEASE \
|
|
$TARGET_ROOT \
|
|
$DIB_DISTRIBUTION_MIRROR \
|
|
${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}"
|
|
|
|
# debootstrap creates sometimes a not-usable
|
|
# /etc/apt/sources.list: DIB wants to set up its own anyway
|
|
# and the old has to go.
|
|
sudo rm -fr ${TARGET_ROOT}/etc/apt/sources.list \
|
|
${TARGET_ROOT}/etc/apt/sources.list.d
|
|
|
|
echo Caching debootstrap result in $DEBOOTSTRAP_TARBALL
|
|
if [ "${DIB_DEBOOTSTRAP_CACHE:-0}" != "0" ]; then
|
|
sudo tar --numeric-owner -C $TARGET_ROOT -zcf $DEBOOTSTRAP_TARBALL --exclude='./tmp/*' .
|
|
fi
|
|
fi
|
|
|
|
sudo rm -f ${TARGET_ROOT}/.extra_settings
|