diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-27 00:43:04 +0100 |
| commit | db40ed98b297d0550c6971b096c87bf0debf59b1 (patch) | |
| tree | 39bb950b98c4ca6292ce2850cd889c9ca1fd9eb6 /mk | |
| parent | 45805efcda653a3e6d7577ac2956c8138b49c7fc (diff) | |
| parent | 83e2707a887a4c495a42f7e59f9f332df6b759ab (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/modules.mk | 5 | ||||
| -rw-r--r-- | mk/package.mk | 3 | ||||
| -rw-r--r-- | mk/pkg-bottom.mk | 2 | ||||
| -rw-r--r-- | mk/vars.mk | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index ecec26b94..496b47503 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -678,6 +678,11 @@ $(eval $(call KMOD_template,IP_VS_FTP,ip-vs-ftp,\ # Block devices # +$(eval $(call KMOD_template,BLK_DEV_DRBD,blk-dev-drbd,\ + $(MODULES_DIR)/kernel/lib/lru_cache \ + $(MODULES_DIR)/kernel/drivers/block/drbd/drbd \ +,20)) + $(eval $(call KMOD_template,BLK_DEV_LOOP,blk-dev-loop,\ $(MODULES_DIR)/kernel/drivers/block/loop \ ,20)) diff --git a/mk/package.mk b/mk/package.mk index 21b84f810..4879f9cf2 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -68,10 +68,9 @@ MAKE_ENV+= WRKDIR='${WRKDIR}' WRKDIST='${WRKDIST}' \ CXXFLAGS='$(strip ${TCXXFLAGS})' \ CPPFLAGS='$(strip ${TCPPFLAGS})' \ LDFLAGS='$(strip ${TLDFLAGS})' -MAKE_ENV+= PATH='${TARGET_PATH}' +MAKE_ENV+= PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' ifeq ($(ADK_NATIVE),) MAKE_ENV+= PATH='${TARGET_PATH}' \ - PKG_CONFIG_LIBDIR='${STAGING_DIR}/usr/lib/pkgconfig' \ ${HOST_CONFIGURE_OPTS} \ CC='${TARGET_CC}' \ CXX='${TARGET_CXX}' \ diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index e68607f9d..82f7b8588 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -144,10 +144,12 @@ else @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2 @exit 1 endif +ifeq ($(ADK_NATIVE),) @for a in ${WRKINST}/usr/{bin/*-config,lib/pkgconfig/*.pc}; do \ [[ -e $$a ]] || continue; \ $(SED) "s,^prefix=.*,prefix=${STAGING_DIR}/usr," $$a; \ done +endif ifeq (,$(filter noremove,${PKG_OPTS})) @if test -s '${STAGING_PARENT}/pkg/${PKG_NAME}'; then \ cd '${STAGING_DIR}'; \ diff --git a/mk/vars.mk b/mk/vars.mk index e04adf36a..3aff9fc76 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -115,11 +115,11 @@ EXTRACT_CMD= mkdir -p ${WRKDIR}; \ *.tar) \ tar -xf $$file ;; \ *.cpio.Z | *.cpio.gz | *.cgz | *.mcz) \ - gzip -dc $$file | cpio -i -d ;; \ + gzip -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ *.tar.Z | *.tar.gz | *.taz | *.tgz) \ gzip -dc $$file | tar -xf - ;; \ *.cpio.bz2 | *.cbz) \ - bzip2 -dc $$file | cpio -i -d ;; \ + bzip2 -dc $$file | $(TOPDIR)/bin/tools/cpio -i -d ;; \ *.tar.bz2 | *.tbz | *.tbz2) \ bzip2 -dc $$file | tar -xf - ;; \ *.zip) \ |