diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /mk | |
parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) |
resolve conflicts
Diffstat (limited to 'mk')
-rw-r--r-- | mk/image.mk | 1 | ||||
-rw-r--r-- | mk/kernel.mk | 2 | ||||
-rw-r--r-- | mk/package.mk | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/mk/image.mk b/mk/image.mk index 6b0eff483..1bfc1f78b 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -42,7 +42,6 @@ image-prepare-post: dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd chmod 4511 ${TARGET_DIR}/bin/busybox - chmod 1777 ${TARGET_DIR}/tmp @if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \ mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ diff --git a/mk/kernel.mk b/mk/kernel.mk index 2ce156694..d5288cd7e 100644 --- a/mk/kernel.mk +++ b/mk/kernel.mk @@ -33,6 +33,7 @@ IDEPENDK_$(1):=kernel ($(KERNEL_VERSION)) $(foreach pkg,$(5),", $(pkg)") PKG_$(1) := $(PACKAGE_DIR)/kmod-$(2)_$(KERNEL_VERSION)-$(KERNEL_RELEASE)_$(CPU_ARCH).$(PKG_SUFFIX) I_$(1) := $(KMOD_BUILD_DIR)/ipkg/$(2) +ifeq ($${ADK_TARGET_KERNEL_CUSTOMISING},y) ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),m) TARGETS+=$$(PKG_$(1)) endif @@ -40,6 +41,7 @@ ifeq ($$(ADK_KPACKAGE_KMOD_$(1)),y) TARGETS+=$$(PKG_$(1)) INSTALL_TARGETS+=$$(PKG_$(1)) endif +endif $$(PKG_$(1)): rm -rf $$(I_$(1)) diff --git a/mk/package.mk b/mk/package.mk index d9d10c79d..e42ced661 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -184,6 +184,7 @@ $$(IPKG_$(1)): $$(IDIR_$(1))/CONTROL/control $${_FAKE_COOKIE} ifeq ($(ADK_DEBUG),) $${RSTRIP} $${IDIR_$(1)} $(MAKE_TRACE) endif +ifeq (${ADK_INSTALL_PACKAGE_INIT_SCRIPTS},y) @for file in $$$$(ls ./files/*.init 2>/dev/null); do \ fname=$$$$(echo $$$$file| sed -e "s#.*/##" -e "s#.init##"); \ check=$$$$(grep PKG $$$$file|cut -d ' ' -f 2); \ @@ -195,6 +196,7 @@ endif [[ -e $$$$script ]] || continue; \ chmod 0755 "$$$$script"; \ done +endif @mkdir -p $${PACKAGE_DIR} '$${STAGING_PKG_DIR}' \ '$${STAGING_TARGET_DIR}/scripts' ifeq (,$(filter noremove,$(7))) |