diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-22 19:46:54 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-11-22 19:46:54 +0000 |
| commit | d2cb7f74bfa01fe4705a6e79ac5ac8a0bde9ac1a (patch) | |
| tree | b340b9484e185f6376b34a9d70135ad70c13a1a8 | |
| parent | 172a68af5b8865e79fc9905f81cdcdda3b5c3d75 (diff) | |
imagebuilder: merge r25078 to align files/ handling with current buildroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34301 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/imagebuilder/files/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b0d0698ac..4d0f1fe11 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -134,6 +134,14 @@ package_install: FORCE copy_files: FORCE @echo @echo Copying extra files + @( cd $(USER_FILES); find -type f ) | \ + ( cd $(TARGET_DIR); while :; do \ + read FILE; \ + [ -z "$$FILE" ] && break; \ + [ -L "$$FILE" ] || continue; \ + echo "Removing symlink $(TARGET_DIR)/$$FILE"; \ + rm -f "$$FILE"; \ + done; ) $(CP) $(USER_FILES)/* $(TARGET_DIR)/ package_postinst: FORCE |