diff options
Diffstat (limited to 'remote/modules')
16 files changed, 18 insertions, 35 deletions
diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build index bc2adc64..d11a3828 100644 --- a/remote/modules/busybox/busybox.build +++ b/remote/modules/busybox/busybox.build @@ -14,7 +14,7 @@ build() if [ ! -e .built ]; then cd src pinfo "Running make" - make -j5 || perror "failed." + make || perror "failed." pinfo "Running make install" make CONFIG_PREFIX="${MODULE_DIR}"/build/"${PREFIX}" install || perror "failed" cd - diff --git a/remote/modules/hwinfo/hwinfo.build b/remote/modules/hwinfo/hwinfo.build index 383b8c2a..b2012a22 100644 --- a/remote/modules/hwinfo/hwinfo.build +++ b/remote/modules/hwinfo/hwinfo.build @@ -9,7 +9,7 @@ fetch_source() { build() { pdebug "Installing libx86emu in ${MODULE_DIR}/build..." cd "${MODULE_DIR}/src/libx86emu" - make || perror "libx86emu: make failed." + EXTRA_FLAGS="-I${MODULE_DIR}/src/libx86emu/include" make || perror "libx86emu: make failed." DESTDIR="${MODULE_DIR}"/build make install || perror "libx86emu: make install failed." cd - &> /dev/null diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build index 88c47f6b..3a924380 100644 --- a/remote/modules/kdm/kdm.build +++ b/remote/modules/kdm/kdm.build @@ -14,8 +14,6 @@ build () { } post_copy() { - # copy static kdm files to stage3.2 - cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR} #create static kdm folders in stage3.2 mkdir -p ${TARGET_BUILD_DIR}/var/lib/kdm mkdir -p ${TARGET_BUILD_DIR}/var/run/kdm diff --git a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build index 19adf66a..7f02e281 100644 --- a/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build +++ b/remote/modules/ldm-gtk-greeter/ldm-gtk-greeter.build @@ -28,11 +28,7 @@ build () { } post_copy() { - #copy static data files - cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_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 > "${TARGET_BUILD_DIR}/usr/lib/${TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed." + gdk-pixbuf-query-loaders > "${TARGET_BUILD_DIR}/usr/lib/${ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders.cache" || perror "pixbuf-query-loaders failed." mkdir -p "${TARGET_BUILD_DIR}/etc/pango" || perror "Making etc/pango failed." pango-querymodules > "${TARGET_BUILD_DIR}/etc/pango/pango.modules" || perror "pango-querymodules failed." gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/hicolor/" || perror "update-icon-cache-3.0 failed." diff --git a/remote/modules/ldm/ldm.build b/remote/modules/ldm/ldm.build index 88429cff..0e73148c 100644 --- a/remote/modules/ldm/ldm.build +++ b/remote/modules/ldm/ldm.build @@ -34,8 +34,5 @@ post_copy() { local LDMGID=$(add_group "lightdm") pinfo "lightdm user and group is $LDMUID $LDMGID" chown -R "${LDMUID}:${LDMGID}" "${TARGET_BUILD_DIR}/var/lib/lightdm/" || perror "chowning '${TARGET_BUILD_DIR}/var/lib/lightdm/' failed." - #copyi static data files - cp -r "${MODULE_DIR}/data/"* "${TARGET_BUILD_DIR}" || perror "Copying data/ failed." - } diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth index bc669108..8499e451 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/default.plymouth +++ b/remote/modules/plymouth/data/share/plymouth/themes/default.plymouth @@ -4,5 +4,5 @@ Description=Uni-Freiburg simple blue-ish theme with simple progress bar ModuleName=script [script] -ImageDir=/lib/plymouth/themes/unifr-rz -ScriptFile=/lib/plymouth/themes/unifr-rz/unifr-rz.script +ImageDir=/share/plymouth/themes/unifr-rz +ScriptFile=/share/plymouth/themes/unifr-rz/unifr-rz.script diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png Binary files differindex 9cb68040..9cb68040 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_banner_trans.png +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_banner_trans.png diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png Binary files differindex 16b069cc..16b069cc 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/rz_logo_trans.png +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/rz_logo_trans.png diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth index 0f300f6b..0f300f6b 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.plymouth +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.plymouth diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script index f2d8bd28..f2d8bd28 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/unifr-rz.script +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/unifr-rz.script diff --git a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png Binary files differindex 4fd4be30..4fd4be30 100644 --- a/remote/modules/plymouth/data/lib/plymouth/themes/unifr-rz/white_dot_small.png +++ b/remote/modules/plymouth/data/share/plymouth/themes/unifr-rz/white_dot_small.png diff --git a/remote/modules/plymouth/plymouth.build b/remote/modules/plymouth/plymouth.build index 4363e809..d5e9c594 100644 --- a/remote/modules/plymouth/plymouth.build +++ b/remote/modules/plymouth/plymouth.build @@ -11,7 +11,7 @@ build() { pinfo "Running configure" ./configure --enable-systemd-integration --disable-gtk --disable-static --prefix=""|| perror "failed." pinfo "Running make" - make -j5 || perror "failed" + make || perror "failed" pinfo "Running make install" DESTDIR="${MODULE_BUILD_DIR}" make install || perror "failed" cd - @@ -20,8 +20,5 @@ build() { } post_copy() { - # copy static dbus systemd unit files to stage3.2 - SYSTEMDDIR=${TARGET_BUILD_DIR}/etc/systemd/system - [ ! -d ${SYSTEMDDIR} ] && mkdir -p ${SYSTEMDDIR} - cp -r ${MODULE_DIR}/data/* ${TARGET_BUILD_DIR} + : } diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build index 6a03b81c..b6b70b7f 100644 --- a/remote/modules/policykit/policykit.build +++ b/remote/modules/policykit/policykit.build @@ -15,9 +15,6 @@ build () { post_copy() { - # copy static policykit files to stage3.2 - cp -r ${MODULE_BUILD_DIR}/data/* ${TARGET_BUILD_DIR} - #Add Polkit User/Group/Shadow to Stage3.2 pinfo "Adding polkitd user to target system..." add_user "polkitd" diff --git a/remote/modules/sshd/sshd.build b/remote/modules/sshd/sshd.build index 57a9e35d..aa4241e6 100644 --- a/remote/modules/sshd/sshd.build +++ b/remote/modules/sshd/sshd.build @@ -15,5 +15,4 @@ build() { post_copy() { mkdir -p "${TARGET_BUILD_DIR}/var/run/sshd" - cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" } diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index 450e743b..57fb705e 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -3,8 +3,7 @@ fetch_source () { if [ ! -e .fetched_source ]; then download_untar "$URL" "src/" - local LIBKMOD_VERSION="kmod-12" - download_untar "http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" "src/" + download_untar "$LIBKMOD_URL" "src/" touch .fetched_source fi } @@ -12,29 +11,27 @@ fetch_source () { build () { if [ ! -e .built ]; then #build libkmod - cd "src/$LIBKMOD_VERSION/" + cd "${MODULE_DIR}/src/$LIBKMOD_VERSION" + pwarning "$(pwd)" ./configure - make -j5 - make install - cd - + make || perror "make failed." + make install || perror "make install failed." + cd - &> /dev/null #build systemd - cd "src/$VERSION/" + cd "${MODULE_DIR}/src/$VERSION" pinfo "calling configure" ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no || perror "configure failed." pinfo "calling make" - make -j5 || perror "make failed." + make || perror "make failed." pinfo "calling make install" DESTDIR="${MODULE_BUILD_DIR}" make install || perror "make install failed." - cd - + cd - &> /dev/null touch .built fi } post_copy() { - # copy static data files - cp -r "${MODULE_DIR}"/data/* "${TARGET_BUILD_DIR}" || perror "copying data files failed." - # dont clear systemd log at startup sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service" diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf index c5e72aeb..634828bd 100644 --- a/remote/modules/systemd/systemd.conf +++ b/remote/modules/systemd/systemd.conf @@ -1,5 +1,7 @@ VERSION=systemd-197 URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz +LIBKMOD_VERSION="kmod-12" +LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz" REQUIRED_DEPENDENCIES=" intltool gperf dbus |
