2012-02-27 15:54:13

by Felix Fietkau

[permalink] [raw]
Subject: [PATCH] compat-wireless: fix directory copying in admin-update.sh

On my system the trailing slash leads to the directory contents being copied
to the target instead of the full directory, which results in breakage during
build.

Signed-off-by: Felix Fietkau <[email protected]>
---
scripts/admin-update.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 369cc96..34022b7 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -425,8 +425,8 @@ mkdir -p $COMPAT
echo "Copying $GIT_COMPAT_TREE/ files..."
cp $GIT_COMPAT_TREE/compat/*.c $COMPAT/
cp $GIT_COMPAT_TREE/compat/Makefile $COMPAT/
-cp -a $GIT_COMPAT_TREE/udev/ .
-cp -a $GIT_COMPAT_TREE/scripts/ $COMPAT/
+cp -a $GIT_COMPAT_TREE/udev .
+cp -a $GIT_COMPAT_TREE/scripts $COMPAT/
cp -a $GIT_COMPAT_TREE/include/linux/* include/linux/
cp -a $GIT_COMPAT_TREE/include/net/* include/net/
cp -a $GIT_COMPAT_TREE/include/trace/* include/trace/
--
1.7.3.2



2012-02-28 01:28:07

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat-wireless: fix directory copying in admin-update.sh

On Mon, Feb 27, 2012 at 6:51 AM, Felix Fietkau <[email protected]> wrote:
> On my system the trailing slash leads to the directory contents being copied
> to the target instead of the full directory, which results in breakage during
> build.
>
> Signed-off-by: Felix Fietkau <[email protected]>

thanks applied and pushed!

Luis