diff options
| author | Simon Rettberg | 2013-11-21 17:51:12 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-11-21 17:51:12 +0100 |
| commit | 09649a04a3a327ae86ba1682fceead3b6dbdef29 (patch) | |
| tree | f2c89634b396ee3b76c53cd33eaefbfc2c123e39 | |
| parent | [clone_stage4] Also exclude links from stage4 if they already exist in stage32 (diff) | |
| parent | Merge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff) | |
| download | tm-scripts-09649a04a3a327ae86ba1682fceead3b6dbdef29.tar.gz tm-scripts-09649a04a3a327ae86ba1682fceead3b6dbdef29.tar.xz tm-scripts-09649a04a3a327ae86ba1682fceead3b6dbdef29.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rw-r--r-- | remote/modules/systemd/systemd.build | 6 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build index a9f530b3..667157aa 100644 --- a/remote/modules/systemd/systemd.build +++ b/remote/modules/systemd/systemd.build @@ -26,11 +26,11 @@ build () { # Save potentially pre-used paths/flages OLDLDFLAGS="$LDFLAGS" OLDCPPFLAGS="$CPPFLAGS" - OLDPKG_CONFIG_PATH="PKG_CONFIG_PATH" + OLDPKG_CONFIG_PATH="$PKG_CONFIG_PATH" - export LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/$LIB64" \ + export LDFLAGS="$LDFLAGS -L${MODULE_BUILD_DIR}/usr/lib" export CPPFLAGS="-I${MODULE_BUILD_DIR}/usr/include" - export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/$LIB64/pkgconfig" + export PKG_CONFIG_PATH="${MODULE_BUILD_DIR}/usr/lib/pkgconfig" ./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls \ --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated \ diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse index 316cb5e4..91e28a7b 100644 --- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse +++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.opensuse @@ -4,6 +4,7 @@ REQUIRED_INSTALLED_PACKAGES=" squashfs timezone libcap2 + jfsutils " REQUIRED_CONTENT_PACKAGES=" timezone |