Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[moslo] Don't overwrite existing tools with busybox links. Fixes NEMO#840 #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions initfs/scripts/moslo-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -341,9 +341,16 @@ rm -f $TMPFILE
# Create (and fix) busybox links
BUSYBOX_BINARY=`find $ROOT_DIR -name "busybox*"`
echo "$BUSYBOX_BINARY"
${BUSYBOX_BINARY} --install -s $ROOT_DIR/bin/
BUSYBOX_TMP=$(mktemp -d -p $ROOT_DIR)
mkdir -p $BUSYBOX_TMP/bin

${BUSYBOX_BINARY} --install -s $BUSYBOX_TMP/bin/
rsync -l --ignore-existing $BUSYBOX_TMP/bin/* $ROOT_DIR/bin/
rm -rf $BUSYBOX_TMP
for l in $ROOT_DIR/bin/*; do
ln -sf /sbin/busybox-static $l
if test -h $l; then
ln -sf /sbin/busybox-static $l
fi
done

#
Expand Down
1 change: 1 addition & 0 deletions rpm/hw-ramdisk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ BuildRequires: findutils
BuildRequires: gzip
BuildRequires: cpio
Requires: busybox-static
Requires: rsync


%description
Expand Down