From d0398dc33628c501388d32dcb3faf68859dd6bcb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 5 Jan 2011 00:18:18 +0100 Subject: update mips qemu targets. 64 Bit kernels still does not boot completely --- mk/build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mk') diff --git a/mk/build.mk b/mk/build.mk index f8143311c..de7ece082 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -191,9 +191,9 @@ switch: fi kernelconfig: - cp $(TOPDIR)/target/$(ARCH)/kernel.config $(BUILD_DIR)/linux/.config + cp $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config $(BUILD_DIR)/linux/.config $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ARCH)/kernel.config + cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET_ARCH)/kernel.config # create a new package from package/.template newpackage: -- cgit v1.2.3 From f710a956089686dc168fe3cb8d2ebd6cb997c9ba Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:31 +0100 Subject: base-files: change access mode of /tmp where it's created Signed-off-by: Phil Sutter --- mk/image.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk') diff --git a/mk/image.mk b/mk/image.mk index 1b7178eef..c7f568c26 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -14,7 +14,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}; \ -- cgit v1.2.3 From 2d2cde54102a8cbb12753c7a67058154b6f9c035 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:50 +0100 Subject: make installation of package init scripts optional Signed-off-by: Phil Sutter --- mk/package.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') diff --git a/mk/package.mk b/mk/package.mk index edbf3c6d5..3d7353a51 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -181,6 +181,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); \ @@ -192,6 +193,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))) -- cgit v1.2.3 From eebde77970ce3476e24d11e4adad992f5b670784 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Fri, 7 Jan 2011 18:21:52 +0100 Subject: allow disabling kernel customisation completely Signed-off-by: Phil Sutter --- mk/kernel.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mk') 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)) -- cgit v1.2.3