diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-21 20:04:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-21 20:04:13 +0100 |
| commit | 357771e31bd0effe155ad2b3ad6326ab086c3b1c (patch) | |
| tree | 09bd7c708f0a0ca6b2f79388a355558a3e7247ce /mk | |
| parent | c33f1fc73a473ffd39ec5cf7cd7b417546b3a8c8 (diff) | |
| parent | 88f8c823598fb3dda3d52e2624df7019096ba64a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 5 | ||||
| -rw-r--r-- | mk/package.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/mk/build.mk b/mk/build.mk index d9d33d6c1..66f49089b 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -38,10 +38,15 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ BUSYBOX_FLASH_UNLOCK=n \ BUSYBOX_FLASH_ERASEALL=n \ BUSYBOX_PIE=n \ + BUSYBOX_TASKSET=n \ BUSYBOX_DEBUG=n \ BUSYBOX_NOMMU=n \ BUSYBOX_WERROR=n \ BUSYBOX_STATIC=n \ + BUSYBOX_FEATURE_AIX_LABEL=n \ + BUSYBOX_FEATURE_SUN_LABEL=n \ + BUSYBOX_FEATURE_OSF_LABEL=n \ + BUSYBOX_FEATURE_SGI_LABEL=n \ ADK_KERNEL_RT2X00_DEBUG=n \ ADK_KERNEL_ATH5K_DEBUG=n diff --git a/mk/package.mk b/mk/package.mk index f5a48dba8..50f5ecb61 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -233,7 +233,7 @@ endif @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$fn; \ + $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_DIR)/usr/lib,g" $$$$fn; \ done ifeq (,$(filter noscripts,$(7))) @cd '$${STAGING_DIR}'; grep 'usr/s*bin/' \ |