diff options
| -rw-r--r-- | platforms/hosttools.in | 2 | ||||
| -rw-r--r-- | platforms/kernel.in | 2 | ||||
| -rw-r--r-- | rules/host-libkmod.in (renamed from rules/cross-libkmod.in) | 2 | ||||
| -rw-r--r-- | rules/host-libkmod.make (renamed from rules/cross-libkmod.make) | 14 | ||||
| -rw-r--r-- | rules/kernel.make | 2 | ||||
| -rw-r--r-- | rules/pre/kernel.make | 2 | ||||
| -rw-r--r-- | rules/templates/template-kernel-in | 2 |
7 files changed, 13 insertions, 13 deletions
diff --git a/platforms/hosttools.in b/platforms/hosttools.in index ff6e90bf4..e032253ad 100644 --- a/platforms/hosttools.in +++ b/platforms/hosttools.in @@ -1,4 +1,3 @@ -source "rules/cross-libkmod.in" source "rules/cross-nasm.in" source "rules/host-cdrkit.in" source "rules/host-cmake.in" @@ -14,6 +13,7 @@ source "rules/host-libblkid.in" source "rules/host-libbz2.in" source "rules/host-libcap.in" source "rules/host-libconfuse.in" +source "rules/host-libkmod.in" source "rules/host-liblzo.in" source "rules/host-libuuid.in" source "rules/host-lzop.in" diff --git a/platforms/kernel.in b/platforms/kernel.in index a570700ea..2b44ec1e2 100644 --- a/platforms/kernel.in +++ b/platforms/kernel.in @@ -5,7 +5,7 @@ menuconfig KERNEL select HOST_U_BOOT_TOOLS if KERNEL_IMAGE_U || (KERNEL_IMAGE_SIMPLE && ARCH_MICROBLAZE) select HOST_XZ if KERNEL_XZ select HOST_LZOP if KERNEL_LZOP - select CROSS_LIBKMOD if KERNEL_MODULES + select HOST_LIBKMOD if KERNEL_MODULES prompt "Linux kernel " if KERNEL diff --git a/rules/cross-libkmod.in b/rules/host-libkmod.in index 3ae065483..60613a2cd 100644 --- a/rules/cross-libkmod.in +++ b/rules/host-libkmod.in @@ -1,4 +1,4 @@ ## SECTION=hosttools_noprompt -config CROSS_LIBKMOD +config HOST_LIBKMOD tristate diff --git a/rules/cross-libkmod.make b/rules/host-libkmod.make index 24e670aa5..6a55cfdf4 100644 --- a/rules/cross-libkmod.make +++ b/rules/host-libkmod.make @@ -11,7 +11,7 @@ # # We provide this package # -CROSS_PACKAGES-$(PTXCONF_CROSS_LIBKMOD) += cross-libkmod +HOST_PACKAGES-$(PTXCONF_HOST_LIBKMOD) += host-libkmod # ---------------------------------------------------------------------------- # Prepare @@ -20,9 +20,9 @@ CROSS_PACKAGES-$(PTXCONF_CROSS_LIBKMOD) += cross-libkmod # # autoconf # -CROSS_LIBKMOD_CONF_TOOL := autoconf -CROSS_LIBKMOD_CONF_OPT := \ - $(HOST_CROSS_AUTOCONF) \ +HOST_LIBKMOD_CONF_TOOL := autoconf +HOST_LIBKMOD_CONF_OPT := \ + $(HOST_AUTOCONF) \ --disable-static \ --enable-shared \ --enable-tools \ @@ -38,10 +38,10 @@ CROSS_LIBKMOD_CONF_OPT := \ # Install # ---------------------------------------------------------------------------- -$(STATEDIR)/cross-libkmod.install: +$(STATEDIR)/host-libkmod.install: @$(call targetinfo) - @$(call world/install, CROSS_LIBKMOD) - @ln -s ../bin/kmod $(CROSS_LIBKMOD_PKGDIR)/sbin/depmod + @$(call world/install, HOST_LIBKMOD) + @ln -s ../bin/kmod $(HOST_LIBKMOD_PKGDIR)/sbin/depmod @$(call touch) # vim: syntax=make diff --git a/rules/kernel.make b/rules/kernel.make index ec969e7a6..590cfbba1 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -56,7 +56,7 @@ KERNEL_MAKEVARS := \ ifdef PTXCONF_KERNEL_MODULES_INSTALL KERNEL_MAKEVARS += \ - DEPMOD=$(PTXCONF_SYSROOT_CROSS)/sbin/depmod + DEPMOD=$(PTXCONF_SYSROOT_HOST)/sbin/depmod endif diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make index cae65cceb..7a2851053 100644 --- a/rules/pre/kernel.make +++ b/rules/pre/kernel.make @@ -55,7 +55,7 @@ kernel/opts = \ HOSTCC=$(HOSTCC) \ ARCH=$(GENERIC_KERNEL_ARCH) \ CROSS_COMPILE=$(COMPILER_PREFIX) \ - DEPMOD=$(PTXCONF_SYSROOT_CROSS)/sbin/depmod + DEPMOD=$(PTXCONF_SYSROOT_HOST)/sbin/depmod \ INSTALL_MOD_PATH=$($(1)_PKGDIR) \ PTX_KERNEL_DIR=$($(1)_DIR) diff --git a/rules/templates/template-kernel-in b/rules/templates/template-kernel-in index d40e6d38d..1b2b06a55 100644 --- a/rules/templates/template-kernel-in +++ b/rules/templates/template-kernel-in @@ -3,7 +3,7 @@ config KERNEL_@PACKAGE@ tristate prompt "Linux kernel (@package@)" - select CROSS_LIBKMOD + select HOST_LIBKMOD #select HOST_U_BOOT_TOOLS help FIXME |