diff options
Diffstat (limited to 'remote')
| -rwxr-xr-x | remote/setup_tools | 128 | ||||
| -rw-r--r-- | remote/tools/dbus/dbus.build | 16 | ||||
| -rw-r--r-- | remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build | 50 | ||||
| -rw-r--r-- | remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf | 2 | ||||
| -rw-r--r-- | remote/tools/ldm/ldm.build | 44 | ||||
| -rw-r--r-- | remote/tools/policykit/policykit.build | 4 | ||||
| -rw-r--r-- | remote/tools/policykit/policykit.conf | 2 | ||||
| -rw-r--r-- | remote/tools/xorg/xorg.build | 21 |
8 files changed, 146 insertions, 121 deletions
diff --git a/remote/setup_tools b/remote/setup_tools index 0660e2ef..e0c092a4 100755 --- a/remote/setup_tools +++ b/remote/setup_tools @@ -1,10 +1,13 @@ #!/bin/bash -MODULE_DIR=${ROOT_DIR}/remote +MODULE_DIR="${ROOT_DIR}/remote" #Create tools directory if not exists -TOOL_DIR=${MODULE_DIR}/tools -INIT_DIR=${MODULE_DIR}/stage3.2 +TOOL_DIR="${MODULE_DIR}/tools" +INIT_DIR="${MODULE_DIR}/stage3.2" + +# Keep track of processed modules +PROCESSED_MODULES="" initial_checks () { @@ -18,20 +21,26 @@ initial_checks () read_config () { - local TOOL_CONFIG=${TOOL_DIR}/${TOOL}/${TOOL}.conf + unset REQUIRED_BINARIES + unset REQUIRED_LIBRARIES + unset REQUIRED_DIRECTORIES + unset REQUIRED_FILES + unset REQUIRED_MODULES - [ ! -e ${TOOL_CONFIG} ] && perror "Config for '$TOOL' not found." + local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf" - . ${TOOL_CONFIG} + [ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found." + + . "${TOOL_CONFIG}" || perror "Sourcing '${TOOL_CONFIG}' failed." } read_build () { - local BUILD_SCRIPT=${TOOL_DIR}/${TOOL}/${TOOL}.build + local BUILD_SCRIPT="${TOOL_DIR}/${TOOL}/${TOOL}.build" - [ ! -e ${BUILD_SCRIPT} ] && perror "Build script for specified tool not found." + [ ! -e "${BUILD_SCRIPT}" ] && perror "Build script for specified tool not found." - . ${BUILD_SCRIPT} + . "${BUILD_SCRIPT}" || perror "Sourcing '${BUILD_SCRIPT}' failed." } copyfileswithdependencies () @@ -100,10 +109,6 @@ copyfileswithdependencies () local RET=$? [ "x$RET" != "x0" ] && perror "Could not tar-copy to $INIT_DIR" fi - unset REQUIRED_BINARIES - unset REQUIRED_LIBRARIES - unset REQUIRED_DIRECTORIES - unset REQUIRED_FILES } get_basic_libs () { @@ -139,48 +144,66 @@ generate_stage32 () { fi # now iterate over given tools and copy them - cd ${TOOL_DIR} while (( "$#" )); do - TOOL=$1 - if [ -d ${TOOL} ]; - then - TOOL_STR="[${TOOL}]" - pinfo "## ## Processing module ## ##" - - #[ "x$DEBUG" != "x1" ] \ - # && echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \ - # && exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log - # TODO: Make above work with the new logging system (add function to logging.inc to switch logfile) - cd "${TOOL}" - pinfo "## Reading config" - read_config - pinfo "## Reading build" - read_build - pinfo "## Installing dependencies" - install_dependencies - pinfo "## Fetching source" - fetch_source - pinfo "## Building" - build - # remove *.la files as they might confuse libtool/linker of other tool packages - find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \; - pinfo "## Copying files with dependencies" - copyfileswithdependencies - pinfo "## Post copy" - post_copy - cd ${TOOL_DIR} - - # reset pipes - #[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- - # TODO - pinfo "## ## Module completed ## ##" - TOOL_STR="" - else - perror "Tool directory for '$TOOL' not found." - # maybe make this a warning instead of error? - fi + process_module "$1" shift done + TOOL_STR="" +} + +process_module() { + [ "$#" -ne "1" ] && perror "process_module: want 1 param." + local TOOL="$1" + [[ "$PROCESSED_MODULES" == *"!${TOOL}!"* ]] && return # Already processed this module + PROCESSED_MODULES="${PROCESSED_MODULES}!${TOOL}!" + local TOOL_STR="" + pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]" + TOOL_STR="[${TOOL}]" + if [ -d "${TOOL_DIR}/${TOOL}" ]; + then + + #[ "x$DEBUG" != "x1" ] \ + # && echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \ + # && exec 6>&1 > ${TOOL_DIR}/${TOOL}/stage32.log + # TODO: Make above work with the new logging system (add function to logging.inc to switch logfile) + cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed." + pinfo "## Reading config" + read_config + # Check if this module has a dependency that wasn't built yet: + if [ ! -z "$REQUIRED_MODULES" ]; then + pinfo "$TOOL depends on ${REQUIRED_MODULES}...." + for DEP in $REQUIRED_MODULES; do + #[[ "$DESIRED_MODULES" != *"!${DEP}!"* ]] && perror "$TOOL has dependency $DEP, but $DEP is not in current profile." + process_module "$DEP" + done + # Read old config again, as it got overwritten by the deps + cd "${TOOL_DIR}/${TOOL}" || perror "Tool dir '${TOOL_DIR}/${TOOL}' seems to exist, but cd to it failed (after building deps)." + read_config + pinfo "<<<<<<<<<<<<<<<<< Dependency modules processed, back to module [ $TOOL ]" + fi + pinfo "## Reading build" + read_build + pinfo "## Installing dependencies" + install_dependencies + pinfo "## Fetching source" + fetch_source + pinfo "## Building" + build + # remove *.la files as they might confuse libtool/linker of other tool packages + find "${TOOL_DIR}/${TOOL}/build" -name '*.la' -exec rm -f {} \; + pinfo "## Copying files with dependencies" + copyfileswithdependencies + pinfo "## Post copy" + post_copy + + # reset pipes + #[ "x$DEBUG" != "x1" ] && exec 1>&6 6>&- + # TODO + pinfo "Module completed." + else + perror "Tool directory for '$TOOL' not found." + # maybe make this a warning instead of error? + fi } clean_tools() { @@ -188,7 +211,6 @@ clean_tools() { #clean all if [ -d ${INIT_DIR} ]; then rm -rf "${INIT_DIR}" || perror "Error deleting $INIT_DIR" - pinfo "Cleaned ${INIT_DIR}" fi for TOOL in $(ls ${TOOL_DIR}); do clean_tool $TOOL diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build index 331d49e4..83cc8efa 100644 --- a/remote/tools/dbus/dbus.build +++ b/remote/tools/dbus/dbus.build @@ -9,25 +9,25 @@ fetch_source() { } build() { - BUILDDIR=${TOOL_DIR}/${TOOL}/build + BUILDDIR="${TOOL_DIR}/${TOOL}/build" COPYLIST="list_dpkg_output" - [ -e ${COPYLIST} ] && rm ${COPYLIST} + [ -e "${COPYLIST}" ] && rm "${COPYLIST}" for FILE in $(dpkg -L dbus | grep -v share/doc | grep -v share/man) do - [ ! -d ${FILE} ] && echo ${FILE} >> ${COPYLIST} + [ ! -d "${FILE}" ] && echo ${FILE} >> "${COPYLIST}" done # prepare target dir & copy there [ ! -d ${BUILDDIR} ] && mkdir -p ${BUILDDIR} - tar -cp $(cat ${COPYLIST}|sort -u) | tar -xp -C ${BUILDDIR} + tarcopy "$(cat "${COPYLIST}" | sort -u)" "${BUILDDIR}" } post_copy() { # copy static dbus systemd unit files to stage3.2 - SYSTEMDDIR=${INIT_DIR}/etc/systemd/system - [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR} - cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR} - + SYSTEMDDIR="${INIT_DIR}/etc/systemd/system" + mkdir -p "${SYSTEMDDIR}" + cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed." } + diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build index 734481d7..edd3427a 100644 --- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build +++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build @@ -1,13 +1,8 @@ #tool/distro specific functions for fetching, building and installing dependencies fetch_source () { - if [ ! -e .fetched_source ]; then - [ ! -d src ] && mkdir src - wget $URL - tar xfz $VERSION.tar.gz -C src/ - rm $VERSION.tar.gz - touch .fetched_source - fi + [ ! -e .fetched_source ] && download_untar "$URL" "src/" + touch .fetched_source } install_dependencies() { @@ -15,29 +10,32 @@ install_dependencies() { } build () { - BUILDDIR=$TOOL_DIR/$TOOL/build + BUILDDIR="$TOOL_DIR/$TOOL/build" if [ ! -e .built ]; then - cd src/$VERSION - ./configure --prefix="/" --datarootdir="/usr/share" - make - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - DESTDIR=$BUILDDIR make install + cd "src/$VERSION" + pinfo "Running configure" + ./configure --prefix="/" --datarootdir="/usr/share" || perror "failed." + pinfo "Running make" + make || perror "failed." + mkdir -p "$BUILDDIR" + pinfo "Running make install" + DESTDIR="$BUILDDIR" make install || perror "failed." COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST + [ -e "$COPYLIST" ] && rm "$COPYLIST" for PACKAGE in ${REQUIRED_PACKAGES} do for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man) do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST + [ ! -d $FILE ] && echo $FILE >> "$COPYLIST" done done # prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR + mkdir -p "$BUILDDIR" + tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR" cd - touch .built @@ -47,13 +45,15 @@ build () { post_copy() { #copy static data files - cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR} + cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/* failed." # TODO: FIX PATH TO TRIPLET... - TRIPLET=$(basename $(dirname $(ldd $SHELL|grep libc | awk -F " " '{print $3}'))) - gdk-pixbuf-query-loaders > ${INIT_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache - mkdir -p ${INIT_DIR}/etc/pango - pango-querymodules > ${INIT_DIR}/etc/pango/pango.modules - gtk-update-icon-cache-3.0 ${INIT_DIR}/usr/share/icons/hicolor/ - update-mime-database ${INIT_DIR}/usr/share/mime - cp -r /var/lib/polkit-1 ${INIT_DIR}/var/lib + TRIPLET="$(basename "$(dirname "$(ldd "$SHELL" | grep libc | awk -F " " '{print $3}')")")" + gdk-pixbuf-query-loaders > "${INIT_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed." + mkdir -p "${INIT_DIR}/etc/pango" || perror "Making etc/pango failed." + pango-querymodules > "${INIT_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed." + gtk-update-icon-cache-3.0 "${INIT_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed." + update-mime-database "${INIT_DIR}/usr/share/mime" || perror "update-mime-database failed." + mkdir -p "${INIT_DIR}/var/lib" + cp -r "/var/lib/polkit-1" "${INIT_DIR}/var/lib/" || perror "Copying -r /var/lib/polkit-1 to '${INIT_DIR}/var/lib/' failed." } + diff --git a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf index faf9f32c..f243fc20 100644 --- a/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf +++ b/remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.conf @@ -5,3 +5,5 @@ REQUIRED_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime- REQUIRED_BINARIES="lightdm-gtk-greeter" REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin /usr/share/polkit-1 /usr/share/dbus-1" REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf" +REQUIRED_MODULES="ldm" + diff --git a/remote/tools/ldm/ldm.build b/remote/tools/ldm/ldm.build index 76f53410..9f45e058 100644 --- a/remote/tools/ldm/ldm.build +++ b/remote/tools/ldm/ldm.build @@ -1,13 +1,8 @@ #tool/distro specific functions for fetching, building and installing dependencies fetch_source () { - if [ ! -e .fetched_source ]; then - [ ! -d src ] && mkdir src - wget $URL - tar xf $VERSION.tar.gz -C src/ - rm $VERSION.tar.gz - touch .fetched_source - fi + [ ! -e .fetched_source ] && download_untar "$URL" "src/" + touch .fetched_source } install_dependencies() { @@ -15,29 +10,31 @@ install_dependencies() { } build () { - BUILDDIR=$TOOL_DIR/$TOOL/build - + BUILDDIR="$TOOL_DIR/$TOOL/build" if [ ! -e .built ]; then - cd src/$VERSION - ./configure --prefix="/" --datarootdir="/usr/share" - make - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - DESTDIR=$BUILDDIR make install + cd "src/$VERSION" + pinfo "Running configure" + ./configure --prefix="/" --datarootdir="/usr/share" || perror "failed." + pinfo "Running make" + make || perror "failed." + mkdir -p "$BUILDDIR" + pinfo "Running make install" + DESTDIR="$BUILDDIR" make install || perror "failed." COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST + [ -e "$COPYLIST" ] && rm "$COPYLIST" for PACKAGE in ${REQUIRED_PACKAGES} do for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man) do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST + [ ! -d $FILE ] && echo $FILE >> "$COPYLIST" done done #prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR + mkdir -p "$BUILDDIR" + tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR" cd - touch .built @@ -46,11 +43,14 @@ build () { } post_copy() { - [ ! -d ${INIT_DIR}/var/lib/lightdm ] && mkdir -p ${INIT_DIR}/var/lib/lightdm - touch ${INIT_DIR}/var/lib/lightdm/.Xauthority - chown -R lightdm:lightdm ${INIT_DIR}/var/lib/lightdm/ + mkdir -p "${INIT_DIR}/var/lib/lightdm" + touch "${INIT_DIR}/var/lib/lightdm/.Xauthority" || perror "Cannot touch '${INIT_DIR}/var/lib/lightdm/.Xauthority'" + local LDMUID=$(add_user "lightdm") + local LDMGID=$(add_group "lightdm") + pinfo "lightdm user and group is $LDMUID $LDMGID" + chown -R "${LDMUID}:${LDMGID}" "${INIT_DIR}/var/lib/lightdm/" || perror "chowning '${INIT_DIR}/var/lib/lightdm/' failed." #copyi static data files - cp -r ${TOOL_DIR}/${TOOL}/data/* ${INIT_DIR} + cp -r "${TOOL_DIR}/${TOOL}/data/"* "${INIT_DIR}" || perror "Copying data/ failed." } diff --git a/remote/tools/policykit/policykit.build b/remote/tools/policykit/policykit.build index 871025a1..a42f48b7 100644 --- a/remote/tools/policykit/policykit.build +++ b/remote/tools/policykit/policykit.build @@ -45,9 +45,7 @@ build () { # prepare target dir & copy there if [ -s "$COPYLIST" ]; then pinfo "using tar to copy all dependencies to $BUILDDIR" - tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR - local RET=$? - [ $RET -ne 0 ] && perror "copy failed." + tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR" else pinfo "no dependencies found!" fi diff --git a/remote/tools/policykit/policykit.conf b/remote/tools/policykit/policykit.conf index 1ccef0e6..c8c27cf3 100644 --- a/remote/tools/policykit/policykit.conf +++ b/remote/tools/policykit/policykit.conf @@ -5,3 +5,5 @@ REQUIRED_PACKAGES="" REQUIRED_BINARIES="" REQUIRED_DIRECTORIES="/bin /etc /lib /usr/share/dbus-1 /usr/share/polkit-1" REQUIRED_FILES="" +REQUIRED_MODULES="systemd" + diff --git a/remote/tools/xorg/xorg.build b/remote/tools/xorg/xorg.build index 590d0bb0..6ce5747c 100644 --- a/remote/tools/xorg/xorg.build +++ b/remote/tools/xorg/xorg.build @@ -1,37 +1,38 @@ #!/bin/bash install_dependencies() { - echo "No dependencies." + : } fetch_source() { - echo "Extracting from running system..." + : } build() { - BUILDDIR=$TOOL_DIR/$TOOL/build + BUILDDIR="$TOOL_DIR/$TOOL/build" COPYLIST="list_dpkg_output" - [ -e $COPYLIST ] && rm $COPYLIST + [ -e "$COPYLIST" ] && rm "$COPYLIST" for PACKAGE in ${REQUIRED_PACKAGES} do for FILE in $(dpkg -L ${PACKAGE} | grep -v share/doc | grep -v share/man) do - [ ! -d $FILE ] && echo $FILE >> $COPYLIST + [ ! -d $FILE ] && echo $FILE >> "$COPYLIST" done done # prepare target dir & copy there - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR - (tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR) &>/dev/null + mkdir -p "$BUILDDIR" + tarcopy "$(cat "$COPYLIST" | sort -u)" "$BUILDDIR" } post_copy() { - [ ! -d $INIT_DIR/etc/X11 ] && mkdir -p $INIT_DIR/etc/X11 + mkdir -p "$INIT_DIR/etc/X11" [ ! -e ${INIT_DIR}/etc/X11/X ] && ln -s /usr/bin/Xorg ${INIT_DIR}/etc/X11/X - [ ! -d $INIT_DIR/var/lib/xkb ] && mkdir -p $INIT_DIR/var/lib/xkb - cp /var/lib/xkb/server* $INIT_DIR/var/lib/xkb + mkdir -p "$INIT_DIR/var/lib/xkb" + cp /var/lib/xkb/server* "$INIT_DIR/var/lib/xkb/" || perror "Copying /var/lib/xkb/server* to '$INIT_DIR/var/lib/xkb/' failed." } + |