diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-06-21 19:17:30 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-06-21 19:17:30 +0000 |
| commit | b4d09af2d02a0f415c7969e8ce226b9e26c4544e (patch) | |
| tree | c09d3ab51710fb0abb509bd9d2b4805e87cf8701 | |
| parent | 952c8099a8dcfd10397d4cbe896a88d5695389ad (diff) | |
| download | ptxdist-b4d09af2d02a0f415c7969e8ce226b9e26c4544e.tar.gz ptxdist-b4d09af2d02a0f415c7969e8ce226b9e26c4544e.tar.xz | |
* kernel: split kernel and modules into two ipkgs, make
external kernel installable remove unnecessary compile
step when DONT_COMPILE_KERNEL is selected; patch by
Steven Scholz
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2834 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | rules/kernel.in | 9 | ||||
| -rw-r--r-- | rules/kernel.make | 28 |
3 files changed, 39 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2005-06-21 Robert Schwebel <r.schwebel@pengutronix.de> + + * kernel: split kernel and modules into two ipkgs, make + external kernel installable remove unnecessary compile + step when DONT_COMPILE_KERNEL is selected; patch by + Steven Scholz + 2005-06-18 Robert Schwebel <r.schwebel@pengutronix.de> * jffs2: fixed macro names; patch by Steven Scholz diff --git a/rules/kernel.in b/rules/kernel.in index 775d7576d..e3f9ada6e 100644 --- a/rules/kernel.in +++ b/rules/kernel.in @@ -166,7 +166,7 @@ config DONT_COMPILE_KERNEL choice prompt "Kernel Image" default KERNEL_IMAGE_BZ - depends on !DONT_COMPILE_KERNEL + depends on !DONT_COMPILE_KERNEL || KERNEL_INSTALL config KERNEL_IMAGE_BZ bool @@ -192,7 +192,12 @@ config KERNEL_INSTALL bool prompt "Install kernel into /boot on target" default n - depends on !DONT_COMPILE_KERNEL + select KERNEL_INSTALL_MODULES if !DONT_COMPILE_KERNEL + +config KERNEL_INSTALL_MODULES + bool + prompt "Install modules into /lib/modules on target" + default n # ---------------------------------------------------------------------------- # Generic Patch Stack diff --git a/rules/kernel.make b/rules/kernel.make index e5006ec45..a0bf2ae4c 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -12,9 +12,17 @@ # # We provide this package # -ifndef PTXCONF_DONT_COMPILE_KERNEL +ifdef PTXCONF_KERNEL_2_4 +PACKAGES += kernel +endif +ifdef PTXCONF_KERNEL_2_6 PACKAGES += kernel endif +ifdef PTXCONF_USE_KERNEL_EXTERNAL_KERNEL +PACKAGES += kernel +endif + + # # Use a PTXdist built kernel which is parametrized here or use one from @@ -387,6 +395,7 @@ endif $(STATEDIR)/kernel.compile: $(kernel_compile_deps) @$(call targetinfo, $@) +ifndef PTXCONF_DONT_COMPILE_KERNEL mkdir -p $(PTXCONF_PREFIX)/bin echo "#!/bin/sh" > $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh echo 'u-boot-mkimage "$$@"' >> $(PTXCONF_PREFIX)/bin/u-boot-mkimage.sh @@ -394,6 +403,7 @@ $(STATEDIR)/kernel.compile: $(kernel_compile_deps) cd $(KERNEL_DIR) && $(KERNEL_PATH) make \ $(KERNEL_TARGET) modules $(KERNEL_MAKEVARS) +endif touch $@ # ---------------------------------------------------------------------------- @@ -419,8 +429,6 @@ endif $(STATEDIR)/kernel.targetinstall: $(kernel_targetinstall_deps) @$(call targetinfo, $@) - rm -fr $(KERNEL_INST_DIR) - ifndef NATIVE ifdef PTXCONF_KERNEL_INSTALL @$(call install_init,default) @@ -437,6 +445,20 @@ ifdef PTXCONF_KERNEL_INSTALL $(call install_copy, 0, 0, 0644, $$i, /boot/$(KERNEL_TARGET), n)\ fi; \ done + @$(call install_finish) +endif +ifdef PTXCONF_KERNEL_INSTALL_MODULES + rm -fr $(KERNEL_INST_DIR) + + @$(call install_init,default) + @$(call install_fixup,PACKAGE,kernel-modules) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(KERNEL_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,) + @$(call install_fixup,DESCRIPTION,missing) + cd $(KERNEL_DIR) && $(KERNEL_PATH) make \ modules_install $(KERNEL_MAKEVARS) INSTALL_MOD_PATH=$(KERNEL_INST_DIR) |