diff options
Diffstat (limited to 'rules')
-rw-r--r-- | rules/base-pkgs.in | 6 | ||||
-rw-r--r-- | rules/base-pkgs.make | 40 | ||||
-rw-r--r-- | rules/glibc.in | 1 | ||||
-rw-r--r-- | rules/kernel-production.make | 31 | ||||
-rw-r--r-- | rules/kernel.make | 21 | ||||
-rw-r--r-- | rules/other/Toplevel.make | 4 | ||||
-rw-r--r-- | rules/project-name.in | 132 |
7 files changed, 2 insertions, 233 deletions
diff --git a/rules/base-pkgs.in b/rules/base-pkgs.in deleted file mode 100644 index dab0735ce..000000000 --- a/rules/base-pkgs.in +++ /dev/null @@ -1,6 +0,0 @@ -## SECTION=core - -config BASE_PKGS - bool - select BASE - default y if PROJECT_USE_BASE_PLATFORM diff --git a/rules/base-pkgs.make b/rules/base-pkgs.make deleted file mode 100644 index 8ead99e0e..000000000 --- a/rules/base-pkgs.make +++ /dev/null @@ -1,40 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BASE_PKGS) += base-pkgs - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/base-pkgs.install: - @$(call targetinfo) - @echo -e \ - "copying 'root' from\n" \ - "'$(PTXDIST_BASE_PLATFORMDIR)'\n" - @tar -c --exclude="./dev/*" \ - -C "$(PTXDIST_BASE_PLATFORMDIR)/root" . | \ - tar -x -C "$(ROOTDIR)" && \ - check_pipe_status - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/base-pkgs.targetinstall: - @$(call targetinfo) - @$(call touch) - -# vim: syntax=make diff --git a/rules/glibc.in b/rules/glibc.in index 662f0aa3e..76174b964 100644 --- a/rules/glibc.in +++ b/rules/glibc.in @@ -7,7 +7,6 @@ config GLIBC if GLIBC menu "glibc " - depends on !PROJECT_USE_BASE_PLATFORM comment "Install options" diff --git a/rules/kernel-production.make b/rules/kernel-production.make deleted file mode 100644 index 21caeb025..000000000 --- a/rules/kernel-production.make +++ /dev/null @@ -1,31 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -ifdef PTXCONF_PROJECT_USE_PRODUCTION - -$(STATEDIR)/kernel.extract: - @$(call targetinfo) - @$(call touch) - -$(STATEDIR)/kernel.prepare: - @$(call targetinfo) - @$(call touch) - -$(STATEDIR)/kernel.compile: - @$(call targetinfo) - @$(call touch) - -kernel_clean: - @rm -rf $(STATEDIR)/kernel.* $(STATEDIR)/kernel-modules.* - @rm -rf $(PKGDIR)/kernel_* $(PKGDIR)/kernel-modules_* - -endif - -# vim: syntax=make diff --git a/rules/kernel.make b/rules/kernel.make index e3e3b4084..e5d5178ed 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -14,17 +14,6 @@ # PACKAGES-$(PTXCONF_KERNEL) += kernel - -# -# when using a production release, -# we use the precompiled kernel from /opt -# -ifdef PTXCONF_PROJECT_USE_PRODUCTION -KERNEL_BDIR := $(PTXDIST_BASE_PLATFORMDIR)/build-target -else -KERNEL_BDIR := $(BUILDDIR) -endif - # # Paths and names # @@ -37,7 +26,7 @@ else KERNEL_SUFFIX := tar.gz KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) endif -KERNEL_DIR := $(KERNEL_BDIR)/$(KERNEL) +KERNEL_DIR := $(BUILDDIR)/$(KERNEL) KERNEL_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/$(PTXCONF_KERNEL_CONFIG)) KERNEL_LICENSE := GPL-2.0-only KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) @@ -98,8 +87,6 @@ KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_DIR)/vmlinux KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_AVR32) := $(KERNEL_DIR)/arch/$(PTXCONF_KERNEL_ARCH_STRING)/boot/images/$(KERNEL_IMAGE) -ifndef PTXCONF_PROJECT_USE_PRODUCTION - ifdef PTXCONF_KERNEL $(KERNEL_CONFIG): @echo @@ -205,8 +192,6 @@ ifdef PTXCONF_KERNEL_TOOL_IIO endif @$(call touch) -endif # !PTXCONF_PROJECT_USE_PRODUCTION - # ---------------------------------------------------------------------------- # Install # ---------------------------------------------------------------------------- @@ -302,8 +287,6 @@ endif # Clean # ---------------------------------------------------------------------------- -ifndef PTXCONF_PROJECT_USE_PRODUCTION - $(STATEDIR)/kernel.clean: @$(call targetinfo) @$(call clean_pkg, KERNEL) @@ -333,6 +316,4 @@ kernel_oldconfig kernel_menuconfig kernel_nconfig: $(STATEDIR)/kernel.extract cp $(KERNEL_DIR)/.config $(KERNEL_CONFIG); \ fi -endif - # vim: syntax=make diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index 632d2c475..82adf969f 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -91,9 +91,7 @@ PTX_PACKAGES_SELECTED := \ $(LAZY_PACKAGES) PTX_PACKAGES_INSTALL := \ - $(PACKAGES) \ - $(PTXDIST_BASE_PACKAGES) \ - $(PACKAGES-b) + $(PACKAGES) # might be non existent include $(foreach dir, $(call reverse,$(subst :,$(space),$(PTXDIST_PATH_POSTRULES))), $(sort $(wildcard $(dir)/*.make))) diff --git a/rules/project-name.in b/rules/project-name.in index a9fdc4792..54562341b 100644 --- a/rules/project-name.in +++ b/rules/project-name.in @@ -34,138 +34,6 @@ config PROJECT_VERSION The string is supposed to start with a "-". comment "------------------------------------" - -config PROJECT_USE_BASE_PLATFORM - bool - -choice - prompt "Build Type" - default PROJECT_BUILD_DEVEL - -config PROJECT_BUILD_DEVEL - bool - prompt "development" - help - Perform a development build, which installs everything into - "${PTXDIST_WORKSPACE}/platform-<PLATFORM>". - - This is the default. If unsure select this. - -config PROJECT_BUILD_PRODUCTION - bool - prompt "production" - help - Perform a production build, which installs everything into - central, system wide location. - -endchoice - - -choice - prompt "location" - depends on PROJECT_BUILD_PRODUCTION - default PROJECT_BUILD_PRODUCTION_PREFIX_DEFAULT_CHOICE - -config PROJECT_BUILD_PRODUCTION_PREFIX_DEFAULT_CHOICE - bool - prompt "default" - help - Build pre-built production release to the default - location. It will be composed of: - - project vendor, - - project name and - - project version. - - The path will look like this: - - "/opt/OSELAS.BSP/Pengutronix/OSELAS.BSP-Pengutronix-AllYes-trunk/platform-ARM-reference-trunk" - - This is the default. If unsure select this. - - -config PROJECT_BUILD_PRODUCTION_PREFIX_CUSTOM_CHOICE - bool - prompt "custom" - help - Build production relase and place it in an individual - location. - -endchoice - - -config PROJECT_BUILD_PRODUCTION_PREFIX_CUSTOM - string - prompt "custom location" - depends on PROJECT_BUILD_PRODUCTION_PREFIX_CUSTOM_CHOICE - help - Specify the location where to place your production release. - -config PROJECT_BUILD_PRODUCTION_PREFIX - string - default "/opt/OSELAS.BSP/${PTXCONF_PROJECT_VENDOR}/OSELAS.BSP-${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}" \ - if PROJECT_BUILD_PRODUCTION_PREFIX_DEFAULT_CHOICE - default "${PTXCONF_PROJECT_BUILD_PRODUCTION_PREFIX_CUSTOM}" \ - if PROJECT_BUILD_PRODUCTION_PREFIX_CUSTOM_CHOICE - -comment "------------------------------------" - -config PROJECT_USE_PRODUCTION - bool - prompt "use pre-built production release" - depends on PROJECT_BUILD_DEVEL - select PROJECT_USE_BASE_PLATFORM - help - Use a pre-built production release. - -choice - prompt "location" - depends on PROJECT_USE_PRODUCTION - default PROJECT_USE_PRODUCTION_PREFIX_DEFAULT_CHOICE - -config PROJECT_USE_PRODUCTION_PREFIX_DEFAULT_CHOICE - bool - prompt "default" - help - Use pre-built production release from default location. - - This is the default. If unsure select this. - -config PROJECT_USE_PRODUCTION_PREFIX_CUSTOM_CHOICE - bool - prompt "custom" - help - Use pre-built production release from an individual location. - -endchoice - -config PROJECT_USE_PRODUCTION_PREFIX_CUSTOM - string - prompt "custom location" - depends on PROJECT_USE_PRODUCTION_PREFIX_CUSTOM_CHOICE - -config PROJECT_USE_PRODUCTION_PREFIX - string - default "/opt/OSELAS.BSP/${PTXCONF_PROJECT_VENDOR}/OSELAS.BSP-${PTXCONF_PROJECT_VENDOR}-${PTXCONF_PROJECT}${PTXCONF_PROJECT_VERSION}" if PROJECT_USE_PRODUCTION_PREFIX_DEFAULT_CHOICE - default "${PTXCONF_PROJECT_USE_PRODUCTION_PREFIX_CUSTOM}" if PROJECT_USE_PRODUCTION_PREFIX_CUSTOM_CHOICE - -config PROJECT_USE_LOCAL_PLATFORM - bool - prompt "built on top of another platform" - depends on PROJECT_BUILD_DEVEL && !PROJECT_USE_PRODUCTION - select PROJECT_USE_BASE_PLATFORM - help - Use an existing platform as origin. This platform must be - specified in the "platform name" entry. - -config PROJECT_USE_LOCAL_PLATFORM_NAME - string - prompt "platform name" - depends on PROJECT_USE_LOCAL_PLATFORM - help - The name of the platform to use. This is the directory name of - the platform in the ptxdist workspace e.g. ``platform-i586''. - -comment "------------------------------------" comment "pre-built package handling" comment "------------------------------------" |