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
58 lines
1.7 KiB
Bash
58 lines
1.7 KiB
Bash
#!/bin/bash
|
|
# Copyright 2012 Hewlett-Packard Development Company, L.P.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
|
|
# options for create-baremetal-image.sh
|
|
if [ -f /etc/debian_version ]; then
|
|
_ARCH=$(dpkg --print-architecture)
|
|
else
|
|
_ARCH=$(uname -m)
|
|
case $_ARCH in
|
|
"x86_64")
|
|
_ARCH="amd64"
|
|
;;
|
|
"armv"*)
|
|
_ARCH="armhf"
|
|
;;
|
|
*)
|
|
echo "WARNING: Unknown architecture: $_ARCH"
|
|
;;
|
|
esac
|
|
fi
|
|
ARCH=${ARCH:-$_ARCH}
|
|
export ARCH
|
|
|
|
export DIB_CHECKSUM=${DIB_CHECKSUM:-0}
|
|
export DIB_NO_TMPFS=${DIB_NO_TMPFS:-0}
|
|
export DIB_MIN_TMPFS=${DIB_MIN_TMPFS:-2}
|
|
# Set via the CLI normally.
|
|
# IMAGE_ELEMENT=
|
|
ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"}
|
|
export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}
|
|
export DIB_OFFLINE=${DIB_OFFLINE:-''}
|
|
|
|
# /sbin and friends aren't automatically included in $PATH when running sudo
|
|
# on Fedora/RHEL/SUSE Linux which breaks various pieces of this script in
|
|
# exciting ways, so inject them into the current $PATH if they're not there.
|
|
if ! [[ ":$PATH" =~ ":/sbin" ]] ; then
|
|
export PATH=$PATH:/sbin
|
|
fi
|
|
if ! [[ ":$PATH" =~ ":/usr/sbin" ]] ; then
|
|
export PATH=$PATH:/usr/sbin
|
|
fi
|
|
if ! [[ ":$PATH" =~ ":/usr/local/sbin" ]] ; then
|
|
export PATH=$PATH:/usr/local/sbin
|
|
fi
|