summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
Diffstat (limited to 'remote')
-rwxr-xr-xremote/setup_tools21
-rw-r--r--remote/tools/dbus/dbus.build16
-rw-r--r--remote/tools/ldm-gtk-greeter/ldm-gtk-greeter.build49
-rw-r--r--remote/tools/ldm/ldm.build44
-rw-r--r--remote/tools/policykit/policykit.build4
-rw-r--r--remote/tools/xorg/xorg.build21
6 files changed, 77 insertions, 78 deletions
diff --git a/remote/setup_tools b/remote/setup_tools
index bf3f5157..74cc1c78 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -18,20 +18,20 @@ initial_checks ()
read_config ()
{
- local TOOL_CONFIG=${TOOL_DIR}/${TOOL}/${TOOL}.conf
+ local TOOL_CONFIG="${TOOL_DIR}/${TOOL}/${TOOL}.conf"
- [ ! -e ${TOOL_CONFIG} ] && perror "Config for '$TOOL' not found."
+ [ ! -e "${TOOL_CONFIG}" ] && perror "Config for '$TOOL' not found."
- . ${TOOL_CONFIG}
+ . "${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 ()
@@ -190,13 +190,14 @@ generate_stage32 () {
fi
# now iterate over given tools and copy them
- cd ${TOOL_DIR}
+ cd "${TOOL_DIR}"
while (( "$#" )); do
TOOL=$1
+ TOOL_STR=""
+ pinfo ">>>>>>>>>>>>>>>>> Processing module [ $TOOL ]"
+ TOOL_STR="[${TOOL}]"
if [ -d ${TOOL} ];
then
- TOOL_STR="[${TOOL}]"
- pinfo "## ## Processing module ## ##"
#[ "x$DEBUG" != "x1" ] \
# && echo "Logging to ${TOOL_DIR}/${TOOL}/stage32.log" \
@@ -225,13 +226,13 @@ generate_stage32 () {
#[ "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
shift
done
+ TOOL_STR=""
}
clean_tools() {
diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build
index 5254497f..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 -cpv $(cat ${COPYLIST}|sort -u) | tar -xpv -C ${BUILDDIR}) &> /dev/null
+ 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..31ad6181 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,14 @@ 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."
+ 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/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/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."
}
+
generated by cgit v1.2.3-55-g7522 (git 2.39.0) at 2026-03-01 00:44:58 +0100