diff options
| author | Jonathan Bauer | 2012-12-13 14:49:20 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2012-12-13 14:49:20 +0100 |
| commit | e466e0812ec5b0504d8dc77328b906e1e2516053 (patch) | |
| tree | ad6369489e4dc5ccfe56ebc546def7be20384984 /remote | |
| parent | plymouth usr/ prefix fix, systemd conditional adding of repository, and minor... (diff) | |
| download | tm-scripts-e466e0812ec5b0504d8dc77328b906e1e2516053.tar.gz tm-scripts-e466e0812ec5b0504d8dc77328b906e1e2516053.tar.xz tm-scripts-e466e0812ec5b0504d8dc77328b906e1e2516053.zip | |
generation of stage 3.1 (init is under data/stage3.1
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/tools/base/base.conf | 4 | ||||
| -rw-r--r-- | remote/tools/dbus/dbus.build | 43 |
2 files changed, 24 insertions, 23 deletions
diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf index 60e6d9c3..1d921557 100644 --- a/remote/tools/base/base.conf +++ b/remote/tools/base/base.conf @@ -10,7 +10,9 @@ REQUIRED_BINARIES=" bash umount rm ldd - strace" + strace + blkid + modprobe" REQUIRED_LIBRARIES=" libcap libcidn libcom_err diff --git a/remote/tools/dbus/dbus.build b/remote/tools/dbus/dbus.build index cd4812cd..940ba9f6 100644 --- a/remote/tools/dbus/dbus.build +++ b/remote/tools/dbus/dbus.build @@ -9,7 +9,6 @@ fetch_source() { } build() { - BUILDDIR=$TOOL_DIR/$TOOL/build COPYLIST="list_dpkg_output" @@ -20,27 +19,27 @@ build() { [ ! -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 - - # fix path: everything in lib/systemd to usr/lib/systemd - cd $BUILDDIR - - TARLIST="list_files_to_fix_prefix" - [ -f $TARLIST ] && rm $TARLIST - - # find files and symlinks with wrong prefix - for FILE in $(find . -type f -o -type l|grep ^./lib/systemd) - do - echo $FILE >> $TARLIST - done - # copy found files to usr/* - [ ! -d $BUILDDIR/usr ] && mkdir -p $BUILDDIR/usr - tar -cpv $(cat $TARLIST|sort -u) | tar -xpv -C $BUILDDIR/usr - # delete original location - rm -rf ./lib/systemd - cd - + # prepare target dir & copy there + [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR + tar -cpv $(cat $COPYLIST|sort -u) | tar -xpv -C $BUILDDIR + + # fix path: everything in lib/systemd to usr/lib/systemd + cd $BUILDDIR + + TARLIST="list_files_to_fix_prefix" + [ -f $TARLIST ] && rm $TARLIST + + # find files and symlinks with wrong prefix + for FILE in $(find . -type f -o -type l|grep ^./lib/systemd) + do + echo $FILE >> $TARLIST + done + # copy found files to usr/* + [ ! -d $BUILDDIR/usr ] && mkdir -p $BUILDDIR/usr + tar -cpv $(cat $TARLIST|sort -u) | tar -xpv -C $BUILDDIR/usr + # delete original location + rm -rf ./lib/systemd + cd - } post_copy() { : |