diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-04-10 19:25:07 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2008-04-10 19:25:07 +0000 |
| commit | 86a7e903427ee34d08d1b676a2c9c65847c930eb (patch) | |
| tree | 183cca5f67667506ad03d0a3489f5ae5b4952f48 /rules | |
| parent | d8b708fddd41189e10a1a1197f631b25793b424e (diff) | |
| download | ptxdist-86a7e903427ee34d08d1b676a2c9c65847c930eb.tar.gz ptxdist-86a7e903427ee34d08d1b676a2c9c65847c930eb.tar.xz | |
* platform support: added pending changes
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7931 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'rules')
46 files changed, 153 insertions, 549 deletions
diff --git a/rules/Kconfig b/rules/Kconfig index d9bfea4ef..2b102bf13 100644 --- a/rules/Kconfig +++ b/rules/Kconfig @@ -29,10 +29,6 @@ endmenu comment "------------------------------------" -menu "Image Creation Options " -source "rules/images.in" -endmenu - menu "Root Filesystem " source "rules/rootfs.in" source "rules/rootfs_init_d_files.in" @@ -41,8 +37,8 @@ source "rules/rootfs_configfiles.in" endmenu menu "Core (Kernel, libc, locales) " +source "rules/platforms.in" source "rules/klibc.in" -source "rules/kernel.in" source "rules/dtc.in" source "rules/libc.in" source "rules/gcclibs.in" diff --git a/rules/apache2_mod_python.make b/rules/apache2_mod_python.make index a1b68ea8f..c9717a18e 100644 --- a/rules/apache2_mod_python.make +++ b/rules/apache2_mod_python.make @@ -67,7 +67,7 @@ APACHE2_MOD_PYTHON_ENV := $(CROSS_ENV) APACHE2_MOD_PYTHON_AUTOCONF = \ $(CROSS_AUTOCONF_USR) \ --with-apxs=$(SYSROOT)/usr/bin/apxs \ - --with-python=$(PTXCONF_HOST_PREFIX)/bin/python + --with-python=$(PTXCONF_SYSROOT_HOST)/bin/python $(STATEDIR)/apache2_mod_python.prepare: $(apache2_mod_python_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/commoncpp2.make b/rules/commoncpp2.make index 028bea6d8..83f513598 100644 --- a/rules/commoncpp2.make +++ b/rules/commoncpp2.make @@ -102,7 +102,7 @@ commoncpp2_install: $(STATEDIR)/commoncpp2.install $(STATEDIR)/commoncpp2.install: $(commoncpp2_install_deps_default) @$(call targetinfo, $@) @$(call install, COMMONCPP2) - install -m755 -D $(COMMONCPP2_DIR)/src/ccgnu2-config $(PTXCONF_HOST_PREFIX)/bin/ccgnu2-config + install -m755 -D $(COMMONCPP2_DIR)/src/ccgnu2-config $(PTXCONF_SYSROOT_HOST)/bin/ccgnu2-config @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/cross-insight.make b/rules/cross-insight.make index 96271dd01..a17a61f47 100644 --- a/rules/cross-insight.make +++ b/rules/cross-insight.make @@ -64,7 +64,7 @@ CROSS_INSIGHT_ENV := $(HOST_ENV) # autoconf # CROSS_INSIGHT_AUTOCONF := --target=$(PTXCONF_GNU_TARGET) \ - --prefix=$(PTX_PREFIX_CROSS) + --prefix=$(PTXCONF_SYSROOT_CROSS) $(STATEDIR)/cross-insight.prepare: $(cross-insight_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/cross-module-init-tools.make b/rules/cross-module-init-tools.make index 25f73fba0..d1bd6dabc 100644 --- a/rules/cross-module-init-tools.make +++ b/rules/cross-module-init-tools.make @@ -55,7 +55,7 @@ CROSS_MODULE_INIT_TOOLS_ENV := $(HOST_ENV) # autoconf # CROSS_MODULE_INIT_TOOLS_AUTOCONF := \ - --prefix=$(PTXCONF_PREFIX) \ + --prefix=$(PTXCONF_SYSROOT_CROSS) \ --build=$(GNU_HOST) \ --host=$(GNU_HOST) \ --target=$(PTXCONF_GNU_TARGET) @@ -87,7 +87,7 @@ cross-module-init-tools_install: $(STATEDIR)/cross-module-init-tools.install $(STATEDIR)/cross-module-init-tools.install: $(cross-module-init-tools_install_deps_default) @$(call targetinfo, $@) - install -D -m 755 $(CROSS_MODULE_INIT_TOOLS_DIR)/depmod $(PTXCONF_CROSS_PREFIX)/sbin/$(PTXCONF_GNU_TARGET)-depmod + install -D -m 755 $(CROSS_MODULE_INIT_TOOLS_DIR)/depmod $(PTXCONF_SYSROOT_CROSS)/sbin/$(PTXCONF_GNU_TARGET)-depmod @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make index 3808665f1..9bd486934 100644 --- a/rules/cross-nasm.make +++ b/rules/cross-nasm.make @@ -66,7 +66,7 @@ CROSS_NASM_ENV := $(HOSTCC_ENV) # autoconf # CROSS_NASM_AUTOCONF := \ - --prefix=$(PTXCONF_PREFIX)/gcc-$(GCC_VERSION)-glibc-$(GLIBC_VERSION)/$(PTXCONF_GNU_TARGET) \ + --prefix=$(PTXCONF_SYSROOT_CROSS) \ --target=$(PTXCONF_GNU_TARGET) \ --host=$(GNU_HOST) \ --build=$(GNU_HOST) diff --git a/rules/cross-pkg-config-wrapper.make b/rules/cross-pkg-config-wrapper.make index 66e72c7cf..8f710edf7 100644 --- a/rules/cross-pkg-config-wrapper.make +++ b/rules/cross-pkg-config-wrapper.make @@ -69,8 +69,8 @@ cross-pkg-config-wrapper_install: $(STATEDIR)/cross-pkg-config-wrapper.install $(STATEDIR)/cross-pkg-config-wrapper.install: $(cross-pkg-config-wrapper_install_deps_default) @$(call targetinfo, $@) - install -D -m755 $(SCRIPTSDIR)/pkg-config-wrapper $(PTX_PREFIX_CROSS)/bin/pkg-config - install -D -m755 $(SCRIPTSDIR)/pkg-config-wrapper $(PTX_PREFIX_CROSS)/bin/$(COMPILER_PREFIX)pkg-config + install -D -m755 $(SCRIPTSDIR)/pkg-config-wrapper $(PTXCONF_SYSROOT_CROSS)/bin/pkg-config + install -D -m755 $(SCRIPTSDIR)/pkg-config-wrapper $(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/flash.make b/rules/flash.make index 4c2e27804..5b2a4341a 100644 --- a/rules/flash.make +++ b/rules/flash.make @@ -66,7 +66,7 @@ $(STATEDIR)/flash.extract: $(flash_extract_deps_default) flash_prepare: $(STATEDIR)/flash.prepare # FIXME: rsc: why this strange path? -FLASH_PATH = PATH=$(PTXCONF_PREFIX)/$(AUTOCONF257)/bin:$(CROSS_PATH) +FLASH_PATH = PATH=$(PTXCONF_SYSROOT_TARGET)/$(AUTOCONF257)/bin:$(CROSS_PATH) FLASH_ENV = $(CROSS_ENV) # diff --git a/rules/freetype.make b/rules/freetype.make index 64ca00599..501241c9e 100644 --- a/rules/freetype.make +++ b/rules/freetype.make @@ -95,7 +95,7 @@ $(STATEDIR)/freetype.install: @$(call targetinfo, $@) @$(call install, FREETYPE) $(INSTALL) -m 755 -D $(FREETYPE_DIR)/builds/unix/freetype-config \ - $(PTX_PREFIX_CROSS)/bin/freetype-config + $(PTXCONF_SYSROOT_CROSS)/bin/freetype-config @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/gdb-wrapper.make b/rules/gdb-wrapper.make index 9b647357d..0533f9525 100644 --- a/rules/gdb-wrapper.make +++ b/rules/gdb-wrapper.make @@ -68,27 +68,27 @@ $(STATEDIR)/gdb-wrapper.install: $(gdb_wrapper_install_deps_default) @$(call targetinfo, $@) # let gdb find the target libraries for remote cross debugging - install -d $(PTXCONF_PREFIX)/etc - rm -f $(PTXCONF_PREFIX)/etc/gdbrc - echo "set solib-search-path $(ROOTDIR)/lib:$(ROOTDIR)/usr/lib" >> $(PTXCONF_PREFIX)/etc/gdbrc - echo "set solib-absolute-prefix $(ROOTDIR)" >> $(PTXCONF_PREFIX)/etc/gdbrc + install -d $(PTXCONF_SYSROOT_TARGET)/etc + rm -f $(PTXCONF_SYSROOT_TARGET)/etc/gdbrc + echo "set solib-search-path $(ROOTDIR)/lib:$(ROOTDIR)/usr/lib" >> $(PTXCONF_SYSROOT_TARGET)/etc/gdbrc + echo "set solib-absolute-prefix $(ROOTDIR)" >> $(PTXCONF_SYSROOT_TARGET)/etc/gdbrc # make gdb wrapper - install -d $(PTXCONF_PREFIX)/bin - rm -f $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossgdb + install -d $(PTXCONF_SYSROOT_TARGET)/bin + rm -f $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossgdb echo "#!/bin/sh" >> \ - $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossgdb - echo "$(PTXCONF_GNU_TARGET)-gdb -x $(PTXCONF_PREFIX)/etc/gdbrc \$$@" >> \ - $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossgdb - chmod 755 $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossgdb + $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossgdb + echo "$(PTXCONF_GNU_TARGET)-gdb -x $(PTXCONF_SYSROOT_TARGET)/etc/gdbrc \$$@" >> \ + $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossgdb + chmod 755 $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossgdb # make ddd wrapper - rm -f $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossddd + rm -f $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossddd echo "#!/bin/sh" >> \ - $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossddd - echo "ddd --debugger $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossgdb \$$@" >> \ - $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossddd - chmod 755 $(PTXCONF_PREFIX)/bin/$(PTXCONF_GNU_TARGET)-crossddd + $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossddd + echo "ddd --debugger $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossgdb \$$@" >> \ + $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossddd + chmod 755 $(PTXCONF_SYSROOT_TARGET)/bin/$(PTXCONF_GNU_TARGET)-crossddd @$(call touch, $@) diff --git a/rules/grub.make b/rules/grub.make index a590d34ee..424de8f93 100644 --- a/rules/grub.make +++ b/rules/grub.make @@ -69,7 +69,7 @@ GRUB_ENV := $(CROSS_ENV) CFLAGS='' GRUB_AUTOCONF := $(CROSS_AUTOCONF_USR) GRUB_AUTOCONF += --target=$(PTXCONF_GNU_TARGET) # FIXME FIXME FIXME -GRUB_AUTOCONF += --prefix=$(PTXCONF_PREFIX) +GRUB_AUTOCONF += --prefix=$(PTXCONF_SYSROOT_TARGET) ifdef PTXCONF_GRUB_EXT2FS GRUB_AUTOCONF += --enable-ext2fs diff --git a/rules/host-cramfs.make b/rules/host-cramfs.make index ee983fea1..7592a3728 100644 --- a/rules/host-cramfs.make +++ b/rules/host-cramfs.make @@ -90,8 +90,8 @@ host-cramfs_install: $(STATEDIR)/host-cramfs.install $(STATEDIR)/host-cramfs.install: $(host-cramfs_install_deps_default) @$(call targetinfo, $@) - cp $(HOST_CRAMFS_DIR)/mkcramfs $(PTXCONF_HOST_PREFIX)/bin - cp $(HOST_CRAMFS_DIR)/cramfsck $(PTXCONF_HOST_PREFIX)/bin + cp $(HOST_CRAMFS_DIR)/mkcramfs $(PTXCONF_SYSROOT_HOST)/bin + cp $(HOST_CRAMFS_DIR)/cramfsck $(PTXCONF_SYSROOT_HOST)/bin @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-dtc.make b/rules/host-dtc.make index 8a2819781..314328fc6 100644 --- a/rules/host-dtc.make +++ b/rules/host-dtc.make @@ -83,7 +83,7 @@ host-dtc_install: $(STATEDIR)/host-dtc.install $(STATEDIR)/host-dtc.install: $(host-dtc_install_deps_default) @$(call targetinfo, $@) - cp $(HOST_DTC_DIR)/dtc $(PTXCONF_HOST_PREFIX)/bin/dtc + cp $(HOST_DTC_DIR)/dtc $(PTXCONF_SYSROOT_HOST)/bin/dtc @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-flex254.make b/rules/host-flex254.make index 8d2822e29..da817daa6 100644 --- a/rules/host-flex254.make +++ b/rules/host-flex254.make @@ -55,7 +55,7 @@ HOST_FLEX254_ENV = $(HOSTCC_ENV) # # autoconf, but without automake :-( # -HOST_FLEX254_AUTOCONF = --prefix=$(PTXCONF_PREFIX)/usr +HOST_FLEX254_AUTOCONF = --prefix=$(PTXCONF_SYSROOT_HOST) $(STATEDIR)/host-flex254.prepare: $(host-flex254_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/host-fontconfig.make b/rules/host-fontconfig.make index c26290579..7c3d4a8e6 100644 --- a/rules/host-fontconfig.make +++ b/rules/host-fontconfig.make @@ -59,7 +59,7 @@ HOST_FONTCONFIG_ENV := \ HOST_FONTCONFIG_AUTOCONF := \ $(HOST_AUTOCONF) \ --disable-docs \ - --with-cache-dir=$(PTX_PREFIX_HOST)/var/cache/fontconfig \ + --with-cache-dir=$(PTXCONF_SYSROOT_HOST)/var/cache/fontconfig \ --with-default-fonts=$(XORG_FONTDIR) \ --with-arch=$(PTXCONF_ARCH_STRING) diff --git a/rules/host-ipkg-utils.make b/rules/host-ipkg-utils.make index bc70ff919..bc7671707 100644 --- a/rules/host-ipkg-utils.make +++ b/rules/host-ipkg-utils.make @@ -59,7 +59,7 @@ host-ipkg-utils_prepare: $(STATEDIR)/host-ipkg-utils.prepare HOST_IPKG_UTILS_PATH := PATH=$(HOST_PATH) HOST_IPKG_UTILS_ENV := $(HOST_ENV) -HOST_IPKG_UTILS_MAKEVARS := PREFIX=$(PTX_PREFIX_HOST) +HOST_IPKG_UTILS_MAKEVARS := PREFIX=$(PTXCONF_SYSROOT_HOST) $(STATEDIR)/host-ipkg-utils.prepare: $(host-ipkg-utils_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/host-localedef.make b/rules/host-localedef.make index 07280122d..da1c2e2c3 100644 --- a/rules/host-localedef.make +++ b/rules/host-localedef.make @@ -92,7 +92,7 @@ host-localedef_install: $(STATEDIR)/host-localedef.install $(STATEDIR)/host-localedef.install: $(host-localedef_install_deps_default) @$(call targetinfo, $@) - cd $(HOST_LOCALEDEF_DIR) && cp localedef $(PTX_PREFIX_HOST)/bin + cd $(HOST_LOCALEDEF_DIR) && cp localedef $(PTXCONF_SYSROOT_HOST)/bin @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index 793d454cc..53e1005f1 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -53,7 +53,7 @@ HOST_MTD_UTILS_ENV := $(HOST_ENV) HOST_MTD_UTILS_MAKEVARS := \ CPPFLAGS="$(HOST_CPPFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \ - PREFIX="$(PTX_PREFIX_HOST)" + PREFIX="$(PTXCONF_SYSROOT_HOST)" $(STATEDIR)/host-mtd-utils.prepare: $(host-mtd-utils_prepare_deps_default) @$(call targetinfo, $@) diff --git a/rules/host-qte.make b/rules/host-qte.make index ee9a97758..ae9730bf7 100644 --- a/rules/host-qte.make +++ b/rules/host-qte.make @@ -56,7 +56,7 @@ HOST_QTE_ENV := $(HOST_ENV) # qte does not use autoconf, but something that looks similar # HOST_QTE_AUTOCONF := \ - -prefix=$(PTX_PREFIX_HOST) \ + -prefix=$(PTXCONF_SYSROOT_HOST) \ -platform=$(GNU_HOST) \ -disable styles \ -disable tools \ @@ -109,7 +109,7 @@ host-qte_install: $(STATEDIR)/host-qte.install $(STATEDIR)/host-qte.install: $(host-qte_install_deps_default) @$(call targetinfo, $@) - cp $(HOST_QTE_DIR)/bin/uic $(PTX_PREFIX_HOST)/bin + cp $(HOST_QTE_DIR)/bin/uic $(PTXCONF_SYSROOT_HOST)/bin @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-slirp.make b/rules/host-slirp.make index 247b515fc..b7cb7932a 100644 --- a/rules/host-slirp.make +++ b/rules/host-slirp.make @@ -57,7 +57,7 @@ HOST_SLIRP_ENV = $(HOSTCC_ENV) # autoconf # HOST_SLIRP_AUTOCONF := $(HOST_AUTOCONF) \ - --prefix=$(PTXCONF_PREFIX)/usr + --prefix=$(PTXCONF_SYSROOT_TARGET)/usr $(STATEDIR)/host-slirp.prepare: $(host-slirp_prepare_deps_default) @$(call targetinfo, $@) @@ -86,8 +86,8 @@ host-slirp_install: $(STATEDIR)/host-slirp.install $(STATEDIR)/host-slirp.install: $(host-slirp_install_deps_default) @$(call targetinfo, $@) - mkdir -p $(PTXCONF_PREFIX)/usr/bin - mkdir -p $(PTXCONF_PREFIX)/usr/man/man1 + mkdir -p $(PTXCONF_SYSROOT_TARGET)/usr/bin + mkdir -p $(PTXCONF_SYSROOT_TARGET)/usr/man/man1 @$(call install, HOST_SLIRP, $(HOST_SLIRP_DIR)/src ,h) @$(call touch, $@) diff --git a/rules/host-umkimage.make b/rules/host-umkimage.make index 640ef41d7..d18c7eca3 100644 --- a/rules/host-umkimage.make +++ b/rules/host-umkimage.make @@ -84,7 +84,7 @@ host-umkimage_install: $(STATEDIR)/host-umkimage.install $(STATEDIR)/host-umkimage.install: $(host-umkimage_install_deps_default) @$(call targetinfo, $@) - install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_HOST_PREFIX)/bin/mkimage + install $(HOST_UMKIMAGE_DIR)/mkimage $(PTXCONF_SYSROOT_HOST)/bin/mkimage @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make index fb6b4d414..d948a23bf 100644 --- a/rules/host-util-linux.make +++ b/rules/host-util-linux.make @@ -87,17 +87,17 @@ $(STATEDIR)/host-util-linux.install: $(host-util-linux_install_deps_default) ifdef PTXCONF_HOST_UTIL_LINUX_FDISK install -D $(HOST_UTIL_LINUX_DIR)/fdisk/fdisk \ - $(PTXCONF_PREFIX)/sbin/fdisk + $(PTXCONF_SYSROOT_TARGET)/sbin/fdisk endif ifdef PTXCONF_HOST_UTIL_LINUX_CFDISK install -D $(HOST_UTIL_LINUX_DIR)/fdisk/cfdisk \ - $(PTXCONF_PREFIX)/sbin/cfdisk + $(PTXCONF_SYSROOT_TARGET)/sbin/cfdisk endif ifdef PTXCONF_HOST_UTIL_LINUX_SFDISK install -D $(HOST_UTIL_LINUX_DIR)/fdisk/sfdisk \ - $(PTXCONF_PREFIX)/sbin/sfdisk + $(PTXCONF_SYSROOT_TARGET)/sbin/sfdisk endif @$(call touch, $@) diff --git a/rules/images.in b/rules/images.in deleted file mode 100644 index b73f38578..000000000 --- a/rules/images.in +++ /dev/null @@ -1,284 +0,0 @@ -############################################################################## -comment "Image Creation for Target" -############################################################################## - -config IMAGE_TGZ - bool - prompt "Generate images/root.tgz" - help - Build a tar.gz archive of the root filesystem, containing the - right owner/group and access permissions. - -config IMAGE_HD - bool - select IMAGE_EXT2 - select HOST_GENPART - prompt "Generate images/hd.img" - help - General - ------- - - Build a harddisk root image. The image will contain a partition - table defined by the following entries. Note that the resulting - partition table does not have CHS entries but only LBA entries, so - you need to switch your (x86-) Bios to LBA. Also note that fdisk will - complain about inconsistent CHS/LBA entries. You can ignore these warnings. - The ptxdist image will be put into the first partition. - - Partition sizes - --------------- - - You can define a partition by giving the first and the last sector of - each partition. Sectors are units of 512 bytes. The first sector (sector 0) - is reserved for the MBR and the partition table. - Sectors can be given either decimal or in hex prefixed with 0x. - Beware that a 256MB flash card does not have exactly 256 * 1024 * 2 sectors - but slightly less. - - Partition types - --------------- - - You can give the partition types as a decimal or hex (prefixed with 0x) value - See at the output of "sfdisk -T" for a list of valid types. No extended - partitions are supported at the moment. - - grub - ---- - - If you select grub in your config, it will be installed on the image and thus - give a bootable image for x86 PCs. The grub stage2 file will be installed right - after the MBR before the first partition, so you need to leave a hole before the - first partition. Starting the partition on sector 300 should be a safe value. - -config IMAGE_HD_PART1 - bool - default y - depends on IMAGE_HD - -config IMAGE_HD_PART1_START - string - depends on IMAGE_HD - prompt "partition 1 start sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART1_END - string - depends on IMAGE_HD - prompt "partition 1 end sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART1_TYPE - string - default "0x83" - depends on IMAGE_HD_PART1 - prompt "partition 1 type" - help - see Generate images/hd.img - -config IMAGE_HD_PART2 - bool - depends on IMAGE_HD - prompt "Create partition 2" - -config IMAGE_HD_PART2_START - string - depends on IMAGE_HD_PART2 - prompt "partition 2 start sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART2_END - string - depends on IMAGE_HD_PART2 - prompt "partition 2 end sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART2_TYPE - string - default "0x83" - depends on IMAGE_HD_PART2 - prompt "partition 2 type" - help - see Generate images/hd.img - -config IMAGE_HD_PART3 - bool - depends on IMAGE_HD_PART2 - prompt "Create partition 3" - -config IMAGE_HD_PART3_START - string - depends on IMAGE_HD_PART3 - prompt "partition 3 start sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART3_END - string - depends on IMAGE_HD_PART3 - prompt "partition 3 end sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART3_TYPE - string - default "0x83" - depends on IMAGE_HD_PART3 - prompt "partition 3 type" - help - see Generate images/hd.img - -config IMAGE_HD_PART4 - bool - depends on IMAGE_HD_PART3 - prompt "Create partition 4" - -config IMAGE_HD_PART4_START - string - depends on IMAGE_HD_PART4 - prompt "partition 4 start sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART4_END - string - depends on IMAGE_HD_PART4 - prompt "partition 4 end sector" - help - see Generate images/hd.img - -config IMAGE_HD_PART4_TYPE - string - default "0x83" - depends on IMAGE_HD_PART4 - prompt "partition 4 type" - help - see Generate images/hd.img - -config IMAGE_IPKG_IMAGE_FROM_REPOSITORY - bool - prompt "make images: use packets from repository" - help - Usually 'make images' packages the files from ${IMAGEDIR} - into ${IMAGEDIR}/root.[filesystem]. If this option is checked the - packet files from the IPKG update site (to be specified in - .ptxdistrc) are taken instead. - -config IMAGE_IPKG_EXTRA_ARGS - string - default "" - prompt "extra arguments passed to ipkg-build" - help - If needed you can add extra arguments for ipkg-build here - (e.g. -c if you want ipkg-build to use tar instead of ar.) - -config IMAGE_JFFS2 - bool - select HOST_MTD_UTILS - prompt "Generate images/root.jffs2" - help - Build a jffs2 image of the root filesystem. This image can be stored - linearly into target's flash device at the start of the desired - partition. You should erase the whole partition first if the image - is smaller than partition's size. If not, garbage data in the remaining - space could confuse the filesystem driver. - -config IMAGE_JFFS2_BLOCKSIZE - int - default -1 - prompt "Erase Block Size" - depends on IMAGE_JFFS2 - help - Enter here the size of each (sector) block in target's flash device. - The image must use the same blocksize as the real JFFS2 filesystem - running on the target. - -config IMAGE_JFFS2_EXTRA_ARGS - string - default "" - prompt "extra arguments passed to mkfs.jffs2" - depends on IMAGE_JFFS2 - help - If needed you can add extra arguments for mkfs.jffs2 here - (e.g. --devtable=${PTXDIST_WORKSPACE}/device_table.txt or - -b to create a big endian filesystem on a little endian host) - -config IMAGE_UIMAGE - bool - prompt "Generate images/uRamdisk" - select HOST_UMKIMAGE - select IMAGE_EXT2 - select IMAGE_EXT2_GZIP - help - The file images/uRamdisk can be loaded separatly by the bootloader U-Boot - -config IMAGE_UIMAGE_NAME - string - default "Application Ramdisk" - prompt "name of the ramdisk image" - depends IMAGE_UIMAGE - help - FIXME: This item needs to be documented - -config IMAGE_UIMAGE_EXTRA_ARGS - string - default "" - prompt "extra arguments passed to umkimage" - depends on IMAGE_UIMAGE - help - If needed you can add extra arguments for umkimage here - (e.g. -a 0xaa00000 -e 0xaa00000 ) - -config IMAGE_CPIO - bool - prompt "Generate images/initrd.gz" - help - Build the traditionally initrd RAM disk to be used - as initramfs by the kernel. - -# TODO: See comment in rules/other/Toplevel.make for this topic -#config IMAGE_MULTI_UIMAGE -# bool -# prompt "Generate a multi image images/muimage" -# select HOST_UMKIMAGE -# select KERNEL -# select IMAGE_CPIO -# help -# This generates a multi content image to be loaded by -# the bootloader U-Boot. It contains the kernel and the -# RAM disk in one image. - -config IMAGE_EXT2 - bool - select HOST_GENEXT2FS - prompt "Generate images/root.ext2" - help - Build an ext2 image of the root filesystem - -config IMAGE_EXT2_SIZE - int - default 20480 - prompt "Size in kilobytes" - depends on IMAGE_EXT2 - help - FIXME: This item needs to be documented - -config IMAGE_EXT2_EXTRA_ARGS - string - default "" - prompt "extra arguments passed to genext2fs" - depends on IMAGE_EXT2 - help - If needed you can add extra arguments for genext2fs here - (e.g. -U -r 0 -D=${PTXDIST_WORKSPACE}/device_table.txt) - -config IMAGE_EXT2_GZIP - bool - prompt "Compress the image using gzip" - depends on IMAGE_EXT2 - help - FIXME: This item needs to be documented - diff --git a/rules/kernel.in b/rules/kernel.in deleted file mode 100644 index d54783fe8..000000000 --- a/rules/kernel.in +++ /dev/null @@ -1,38 +0,0 @@ -# -# rules/kernel.in -# - -menuconfig KERNEL - bool - default y - prompt "linux kernel " - help - Build the Linux kernel. - -config KERNEL_INSTALL - bool - prompt "install kernel into /boot" - depends on KERNEL - -config KERNEL_MODULES - bool - depends on KERNEL - default y - prompt "build kernel-modules" - -config KERNEL_MODULES_INSTALL - bool - default y - prompt "Install modules into /lib/modules" - depends on KERNEL - depends on KERNEL_MODULES - -# -# autogenerated -# - -config KERNEL_MODULES_BUILD - depends on KERNEL_MODULES - string - default "modules" - diff --git a/rules/kernel.make b/rules/kernel.make index 2d35fde2f..9c37d3980 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -30,6 +30,7 @@ endif # # handle special compilers # +ifneq ($(PTX_COMPILER_PREFIX_KERNEL),) ifneq ($(PTX_COMPILER_PREFIX),$(PTX_COMPILER_PREFIX_KERNEL)) ifeq ($(wildcard .ktoolchain/$(PTX_COMPILER_PREFIX_KERNEL)gcc),) $(warning *** no .ktoolchain link found. Please create a link) @@ -38,6 +39,7 @@ $(error ) endif KERNEL_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/.ktoolchain/ endif +endif # # Paths and names @@ -121,7 +123,7 @@ KERNEL_MAKEVARS := \ ARCH=$(PTXCONF_KERNEL_ARCH_STRING) \ CROSS_COMPILE=$(KERNEL_TOOLCHAIN_LINK)$(PTX_COMPILER_PREFIX_KERNEL) \ \ - DEPMOD=$(PTX_PREFIX_CROSS)/sbin/$(PTXCONF_GNU_TARGET)-depmod \ + DEPMOD=$(PTXCONF_SYSROOT_CROSS)/sbin/$(PTXCONF_GNU_TARGET)-depmod \ INSTALL_MOD_PATH=$(KERNEL_DIR_INSTALL) \ PTX_KERNEL_DIR=$(KERNEL_DIR) diff --git a/rules/klibc.make b/rules/klibc.make index 1bd7f7e0f..b57a49c39 100644 --- a/rules/klibc.make +++ b/rules/klibc.make @@ -216,7 +216,7 @@ endif # # install the compiler wrapper to be used to link programs against klibc # - install $(KLIBC_DIR)/klcc/klcc $(PTXCONF_CROSS_PREFIX)/bin/klcc + install $(KLIBC_DIR)/klcc/klcc $(PTXCONF_SYSROOT_CROSS)/bin/klcc # # install a few commands to the local architecture directory # but important is the klibc.a only to link programs against it @@ -248,6 +248,6 @@ klibc_clean: rm -rf $(STATEDIR)/klibc.* rm -rf $(IMAGEDIR)/klibc_* rm -rf $(KLIBC_DIR) - rm -rf $(PTXCONF_CROSS_PREFIX)/bin/klcc + rm -rf $(PTXCONF_SYSROOT_CROSS)/bin/klcc # vim: syntax=make diff --git a/rules/libpng.make b/rules/libpng.make index caa5d696a..1038c6b7c 100644 --- a/rules/libpng.make +++ b/rules/libpng.make @@ -95,8 +95,8 @@ libpng_install: $(STATEDIR)/libpng.install $(STATEDIR)/libpng.install: @$(call targetinfo, $@) @$(call install, LIBPNG) - $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng-config $(PTXCONF_CROSS_PREFIX)/bin/libpng-config - $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng12-config $(PTXCONF_CROSS_PREFIX)/bin/libpng12-config + $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng-config $(PTXCONF_SYSROOT_CROSS)/bin/libpng-config + $(INSTALL) -m 755 -D $(LIBPNG_DIR)/libpng12-config $(PTXCONF_SYSROOT_CROSS)/bin/libpng12-config @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/libxml2.make b/rules/libxml2.make index 2b271a313..6240189b8 100644 --- a/rules/libxml2.make +++ b/rules/libxml2.make @@ -300,7 +300,7 @@ libxml2_install: $(STATEDIR)/libxml2.install $(STATEDIR)/libxml2.install: $(libxml2_install_deps_default) @$(call targetinfo, $@) @$(call install, LIBXML2) - install -D $(LIBXML2_DIR)/xml2-config $(PTXCONF_CROSS_PREFIX)/bin/xml2-config + install -D $(LIBXML2_DIR)/xml2-config $(PTXCONF_SYSROOT_CROSS)/bin/xml2-config @$(call touch, $@) # ---------------------------------------------------------------------------- diff --git a/rules/libxslt.make b/rules/libxslt.make index 21c3c2f93..4152fb989 100644 --- a/rules/libxslt.make +++ b/rules/libxslt.make @@ -123,7 +123,7 @@ $(STATEDIR)/libxslt.install: $(libxslt_install_deps_default) # FIXME: this probably has to be fixed upstream! # libxslt installs xslt-config to wrong path. - install $(LIBXSLT_DIR)/xslt-config $(PTXCONF_CROSS_PREFIX)/bin/ + install $(LIBXSLT_DIR)/xslt-config $(PTXCONF_SYSROOT_CROSS)/bin/ @$(call touch, $@) diff --git a/rules/ltp.make b/rules/ltp.make index 681a60e15..d038a3865 100644 --- a/rules/ltp.make +++ b/rules/ltp.make @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_LTP) += ltp # # Paths and names # -LTP_VERSION = 20080229 +LTP_VERSION = 20080331 LTP = ltp-full-$(LTP_VERSION) LTP_SUFFIX = tgz LTP_URL = $(PTXCONF_SETUP_SFMIRROR)/ltp/$(LTP).$(LTP_SUFFIX) diff --git a/rules/mico.make b/rules/mico.make index 6cb9359f1..d5a5fc136 100644 --- a/rules/mico.make +++ b/rules/mico.make @@ -69,7 +69,7 @@ MICO_ENV = $(CROSS_ENV) # autoconf # MICO_AUTOCONF = --target=$(PTXCONF_GNU_TARGET) -MICO_AUTOCONF += --with-mico=$(PTXCONF_PREFIX) +MICO_AUTOCONF += --with-mico=$(PTXCONF_SYSROOT_TARGET) # FIXME: this should be fixed upstream MICO_AUTOCONF += --prefix=$(SYSROOT) diff --git a/rules/other/Definitions.make b/rules/other/Definitions.make index ba96bbda7..7af55f115 100644 --- a/rules/other/Definitions.make +++ b/rules/other/Definitions.make @@ -17,7 +17,7 @@ M2B=$(STATEDIR)/environment # Select make variables for export to shell (by full name) # M2B_DUMP_VARIABLES := PTXCONF_CONFIGFILE_VERSION -M2B_DUMP_VARIABLES += PTXCONFIG PTXCONF_PREFIX PTXCONF_PROJECT PTXCONF_PROJECT_VERSION +M2B_DUMP_VARIABLES += PTXCONFIG PTXCONF_SYSROOT_TARGET PTXCONF_PROJECT PTXCONF_PROJECT_VERSION M2B_DUMP_VARIABLES += PTXDIST_WORKSPACE PTXDIST_TOPDIR M2B_DUMP_VARIABLES += PTXDIST PTXDIST_FULLVERSION M2B_DUMP_VARIABLES += RULESDIR SCRIPTSDIR STATEDIR SYSROOT WORKDIR diff --git a/rules/other/Namespace.make b/rules/other/Namespace.make index 4aa5ea4e2..c7b814fdf 100644 --- a/rules/other/Namespace.make +++ b/rules/other/Namespace.make @@ -1,6 +1,13 @@ -PTX_PREFIX := $(call remove_quotes, $(PTXCONF_PREFIX)) -PTX_PREFIX_HOST := $(call remove_quotes, $(PTXCONF_HOST_PREFIX)) -PTX_PREFIX_CROSS := $(call remove_quotes, $(PTXCONF_CROSS_PREFIX)) +PLATFORMDIR := $(call remove_quotes, $(PLATFORMDIR)) + +ifneq ($(PTXDIST_PLATFORM),) +PTXDIST_PLATFORM_PREFIX=platform- +endif + +PTXCONF_PLATFORM := $(call remove_quotes,$(PTXCONF_PLATFORM)) +PTXCONF_SYSROOT_TARGET := $(call remove_quotes, $(PTXCONF_SYSROOT_TARGET)) +PTXCONF_SYSROOT_HOST := $(call remove_quotes, $(PTXCONF_SYSROOT_HOST)) +PTXCONF_SYSROOT_CROSS := $(call remove_quotes, $(PTXCONF_SYSROOT_CROSS)) PTX_COMPILER_PREFIX := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX)) PTX_COMPILER_PREFIX_KERNEL := $(call remove_quotes, $(PTXCONF_COMPILER_PREFIX_KERNEL)) diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make index af09ce8a0..800adb104 100644 --- a/rules/other/Toplevel.make +++ b/rules/other/Toplevel.make @@ -40,9 +40,12 @@ else SRCDIR = $(call remove_quotes,$(PTXCONF_SETUP_SRCDIR)) endif --include $(PTXDIST_WORKSPACE)/platformconfig +# first, include the ptxconfig with packet definitions -include $(PTXDIST_WORKSPACE)/ptxconfig +# platformconfig comes after ptxconfig, so it is able to overwrite things +-include $(PTXDIST_WORKSPACE)/.platformconfig + # ---------------------------------------------------------------------------- # Packets for host, cross and target # ---------------------------------------------------------------------------- @@ -58,16 +61,6 @@ VIRTUAL := # ---------------------------------------------------------------------------- -# PTXCONF_PREFIX can be overwritten from the make var PREFIX -# FIXME: rsc: this needs to be migrated to DESTDIR, because it's not PREFIX! -# ---------------------------------------------------------------------------- - -ifdef PREFIX -PTXCONF_PREFIX := $(PREFIX) -PREFIX := -endif - -# ---------------------------------------------------------------------------- # Include all rule files # ---------------------------------------------------------------------------- @@ -202,7 +195,9 @@ ipkg-push: $(STATEDIR)/ipkg-push $(STATEDIR)/ipkg-push: $(STATEDIR)/host-ipkg-utils.install @$(call targetinfo, $@) ( \ - export PATH=$(PTXCONF_PREFIX)/bin:$(PTXCONF_PREFIX)/usr/bin:$$PATH; \ + PATH=$(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/usr/bin:$$PATH; \ + PATH=$(PTXCONF_SYSROOT_HOST)/bin:$(PTXCONF_SYSROOT_HOST)/usr/bin:$$PATH; \ + export $$PATH; \ $(PTXDIST_TOPDIR)/scripts/ipkg-push \ --ipkgdir $(call remove_quotes,$(IMAGEDIR)) \ --repodir $(call remove_quotes,$(PTXCONF_SETUP_IPKG_REPOSITORY)) \ @@ -292,7 +287,7 @@ $(STATEDIR)/image_working_dir: $(IPKG_FILES) $(IMAGEDIR)/permissions $(IMAGEDIR) @rm -rf $(WORKDIR) @mkdir $(WORKDIR) @echo -n "Extracting ipkg packages into working directory..." - @DESTDIR=$(WORKDIR) $(FAKEROOT) -- $(PTXCONF_HOST_PREFIX)/bin/ipkg-cl -f $(IMAGEDIR)/ipkg.conf -o $(WORKDIR) install $(IPKG_FILES) 2>&1 >/dev/null + @DESTDIR=$(WORKDIR) $(FAKEROOT) -- $(PTXCONF_SYSROOT_HOST)/bin/ipkg-cl -f $(IMAGEDIR)/ipkg.conf -o $(WORKDIR) install $(IPKG_FILES) 2>&1 >/dev/null @$(call touch, $@) # @@ -315,7 +310,7 @@ $(IMAGEDIR)/root.jffs2: $(STATEDIR)/image_working_dir @cd $(WORKDIR); \ ($(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions && \ ( \ - echo -n "$(PTXCONF_HOST_PREFIX)/sbin/mkfs.jffs2 "; \ + echo -n "$(PTXCONF_SYSROOT_HOST)/sbin/mkfs.jffs2 "; \ echo -n "-d $(WORKDIR) "; \ echo -n "--eraseblock=$(PTXCONF_IMAGE_JFFS2_BLOCKSIZE) "; \ echo -n "$(PTXCONF_IMAGE_JFFS2_EXTRA_ARGS) "; \ @@ -331,7 +326,7 @@ $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir @cd $(WORKDIR); \ ($(AWK) -F: $(DOPERMISSIONS) $(IMAGEDIR)/permissions && \ ( \ - echo -n "$(PTXCONF_HOST_PREFIX)/bin/genext2fs "; \ + echo -n "$(PTXCONF_SYSROOT_HOST)/bin/genext2fs "; \ echo -n "-b $(PTXCONF_IMAGE_EXT2_SIZE) "; \ echo -n "$(PTXCONF_IMAGE_EXT2_EXTRA_ARGS) "; \ echo -n "-d $(WORKDIR) "; \ @@ -344,7 +339,7 @@ $(IMAGEDIR)/root.ext2: $(STATEDIR)/image_working_dir # $(IMAGEDIR)/hd.img: $(IMAGEDIR)/root.ext2 @echo -n "Creating hdimg from root.ext2"; \ - PATH=$(PTXCONF_HOST_PREFIX)/bin:$$PATH $(PTXDIST_TOPDIR)/scripts/genhdimg \ + PATH=$(PTXCONF_SYSROOT_HOST)/bin:$$PATH $(PTXDIST_TOPDIR)/scripts/genhdimg \ -o $@ $(GENHDIMARGS) @echo "done." @@ -362,7 +357,7 @@ $(IMAGEDIR)/root.ext2.gz: $(IMAGEDIR)/root.ext2 # $(IMAGEDIR)/uRamdisk: $(IMAGEDIR)/root.ext2.gz @echo -n "Creating U-Boot ramdisk from root.ext2.gz..."; - @$(PTXCONF_HOST_PREFIX)/bin/mkimage \ + @$(PTXCONF_SYSROOT_HOST)/bin/mkimage \ -A $(MKIMAGE_ARCH) \ -O Linux \ -T ramdisk \ @@ -393,7 +388,7 @@ $(IMAGEDIR)/initrd.gz: $(STATEDIR)/image_working_dir # #$(IMAGEDIR)/muimage: $(IMAGEDIR)/initrd.gz $(KERNEL_DIR)/??????? # @echo -n "Creating multi content uimage..." -# @$(PTXCONF_HOST_PREFIX)/bin/mkimage -A $(PTXCONF_ARCH_STRING) \ +# @$(PTXCONF_SYSROOT_HOST)/bin/mkimage -A $(PTXCONF_ARCH_STRING) \ # -O Linux -T multi -C gzip -a 0 -e 0 \ # -n 'Multi-File Image' \ # -d $(KERNEL_DIR)/vmlinux.bin.gz:$(IMAGEDIR)/initrd.img \ @@ -436,78 +431,6 @@ else endif # ---------------------------------------------------------------------------- -# Test -# ---------------------------------------------------------------------------- - -ipkg-test: world - @$(call targetinfo,ipkg-test) - @IMAGES=$(IMAGEDIR) ROOT=$(ROOTDIR) \ - IPKG=$(call remove_quotes,$(PTXCONF_PREFIX))/bin/ipkg-cl \ - $(PTXDIST_TOPDIR)/scripts/ipkg-test - -# ---------------------------------------------------------------------------- - -qa-static: - @cd $(PTXDIST_WORKSPACE); \ - rm -f QA.log; \ - echo "QA: Static Analysis Report" >> QA-static.log; \ - echo start: `date` >> QA-static.log; \ - echo >> QA-static.log; \ - scripts/qa-static/master >> QA-static.log 2>&1; \ - echo >> QA-static.log; \ - echo stop: `date` >> QA-static.log; \ - echo >> QA-static.log; - @cat QA-static.log; - -# ---------------------------------------------------------------------------- - -# qa-autobuild: -# @cd $(PTXDIST_WORKSPACE); \ -# rm -f QA-autobuild.log; \ -# echo | tee -a QA-autobuild.log; \ -# echo "QA: Autobuild Report" | tee -a QA-autobuild.log; \ -# echo "start: `date`" | tee -a QA-autobuild.log; \ -# echo | tee -a QA-autobuild.log; \ -# \ -# for i in `find $(PROJECTDIRS) -name "*.ptxconfig"`; do \ -# autobuild=`echo $$i | perl -p -e "s/.ptxconfig/.autobuild/g"`; \ -# if [ -x "$$autobuild" ]; then \ -# PTXDIST_TOPDIR=$(PTXDIST_TOPDIR) \ -# PTXDIST_WORKSPACE=$(PTXDIST_WORKSPACE) \ -# $$autobuild | tee -a QA-autobuild.log; \ -# else \ -# echo "skipping `basename $$autobuild`|tee -a QA-autobuild.log"; \ -# fi; \ -# done; \ -# echo | tee -a QA-autobuild.log; \ -# echo stop: `date` | tee -a QA-autobuild.log; \ -# echo | tee -a QA-autobuild.log - -# ---------------------------------------------------------------------------- -# SVN Targets -# ---------------------------------------------------------------------------- - -# svn-up: -# @$(call targetinfo, Updating in Toplevel) -# @cd $(PTXDIST_TOPDIR) && svn update -# @if [ -d "$(PROJECTDIR)" ]; then \ -# $(call targetinfo, Updating in PROJECTDIR); \ -# cd $(PROJECTDIR); \ -# [ -d .svn ] && svn update; \ -# fi; -# @echo "done." -# -# svn-stat: -# @$(call targetinfo, svn stat in Toplevel) -# @cd $(PTXDIST_TOPDIR) && svn stat -# @if [ -d "$(PROJECTDIR)" ]; then \ -# $(call targetinfo, svn stat in PROJECTDIR); \ -# cd $(PROJECTDIR); \ -# [ -d .svn ] && svn stat; \ -# fi; -# @echo "done." - -# ---------------------------------------------------------------------------- # Misc other targets # ---------------------------------------------------------------------------- diff --git a/rules/pelts_tests.make b/rules/pelts_tests.make index d20b3e783..3d626ff34 100644 --- a/rules/pelts_tests.make +++ b/rules/pelts_tests.make @@ -12,7 +12,7 @@ # # We provide this package # -PACKAGES-$(PTXCONF_PELTS_TESTS) += pelts_tests +PACKAGES-$(PTXCONF_PELTS_TESTS) += pelts-tests # # Paths and names @@ -28,9 +28,9 @@ PELTS_TESTS_DIR := $(BUILDDIR)/$(PELTS_TESTS) # Get # ---------------------------------------------------------------------------- -pelts_tests_get: $(STATEDIR)/pelts_tests.get +pelts-tests_get: $(STATEDIR)/pelts-tests.get -$(STATEDIR)/pelts_tests.get: $(pelts_tests_get_deps_default) +$(STATEDIR)/pelts-tests.get: $(pelts-tests_get_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -42,9 +42,9 @@ $(PELTS_TESTS_SOURCE): # Extract # ---------------------------------------------------------------------------- -pelts_tests_extract: $(STATEDIR)/pelts_tests.extract +pelts-tests_extract: $(STATEDIR)/pelts-tests.extract -$(STATEDIR)/pelts_tests.extract: $(pelts_tests_extract_deps_default) +$(STATEDIR)/pelts-tests.extract: $(pelts-tests_extract_deps_default) @$(call targetinfo, $@) @$(call clean, $(PELTS_TESTS_DIR)) @$(call extract, PELTS_TESTS) @@ -55,7 +55,7 @@ $(STATEDIR)/pelts_tests.extract: $(pelts_tests_extract_deps_default) # Prepare # ---------------------------------------------------------------------------- -pelts_tests_prepare: $(STATEDIR)/pelts_tests.prepare +pelts-tests_prepare: $(STATEDIR)/pelts-tests.prepare PELTS_TESTS_PATH := PATH=$(CROSS_PATH) PELTS_TESTS_ENV := $(CROSS_ENV) @@ -65,7 +65,7 @@ PELTS_TESTS_ENV := $(CROSS_ENV) # PELTS_TESTS_AUTOCONF := $(CROSS_AUTOCONF_USR) -$(STATEDIR)/pelts_tests.prepare: $(pelts_tests_prepare_deps_default) +$(STATEDIR)/pelts-tests.prepare: $(pelts-tests_prepare_deps_default) @$(call targetinfo, $@) @$(call clean, $(PELTS_TESTS_DIR)/config.cache) cd $(PELTS_TESTS_DIR) && \ @@ -77,9 +77,9 @@ $(STATEDIR)/pelts_tests.prepare: $(pelts_tests_prepare_deps_default) # Compile # ---------------------------------------------------------------------------- -pelts_tests_compile: $(STATEDIR)/pelts_tests.compile +pelts-tests_compile: $(STATEDIR)/pelts-tests.compile -$(STATEDIR)/pelts_tests.compile: $(pelts_tests_compile_deps_default) +$(STATEDIR)/pelts-tests.compile: $(pelts-tests_compile_deps_default) @$(call targetinfo, $@) cd $(PELTS_TESTS_DIR) && $(PELTS_TESTS_PATH) make @$(call touch, $@) @@ -88,9 +88,9 @@ $(STATEDIR)/pelts_tests.compile: $(pelts_tests_compile_deps_default) # Install # ---------------------------------------------------------------------------- -pelts_tests_install: $(STATEDIR)/pelts_tests.install +pelts-tests_install: $(STATEDIR)/pelts-tests.install -$(STATEDIR)/pelts_tests.install: $(pelts_tests_install_deps_default) +$(STATEDIR)/pelts-tests.install: $(pelts-tests_install_deps_default) @$(call targetinfo, $@) @$(call touch, $@) @@ -98,23 +98,23 @@ $(STATEDIR)/pelts_tests.install: $(pelts_tests_install_deps_default) # Target-Install # ---------------------------------------------------------------------------- -pelts_tests_targetinstall: $(STATEDIR)/pelts_tests.targetinstall +pelts-tests_targetinstall: $(STATEDIR)/pelts-tests.targetinstall -$(STATEDIR)/pelts_tests.targetinstall: $(pelts_tests_targetinstall_deps_default) +$(STATEDIR)/pelts-tests.targetinstall: $(pelts-tests_targetinstall_deps_default) @$(call targetinfo, $@) - @$(call install_init, pelts_tests) - @$(call install_fixup,pelts_tests,PACKAGE,pelts-tests) - @$(call install_fixup,pelts_tests,PRIORITY,optional) - @$(call install_fixup,pelts_tests,VERSION,$(PELTS_TESTS_VERSION)) - @$(call install_fixup,pelts_tests,SECTION,base) - @$(call install_fixup,pelts_tests,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - @$(call install_fixup,pelts_tests,DEPENDS,) - @$(call install_fixup,pelts_tests,DESCRIPTION,missing) + @$(call install_init, pelts-tests) + @$(call install_fixup,pelts-tests,PACKAGE,pelts-tests) + @$(call install_fixup,pelts-tests,PRIORITY,optional) + @$(call install_fixup,pelts-tests,VERSION,$(PELTS_TESTS_VERSION)) + @$(call install_fixup,pelts-tests,SECTION,base) + @$(call install_fixup,pelts-tests,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,pelts-tests,DEPENDS,) + @$(call install_fixup,pelts-tests,DESCRIPTION,missing) - @$(call install_copy, pelts_tests, 0, 0, 0755, $(PELTS_TESTS_DIR)/src/floattest, /usr/bin/floattest) + @$(call install_copy, pelts-tests, 0, 0, 0755, $(PELTS_TESTS_DIR)/src/floattest, /usr/bin/floattest) - @$(call install_finish,pelts_tests) + @$(call install_finish,pelts-tests) @$(call touch, $@) @@ -122,9 +122,9 @@ $(STATEDIR)/pelts_tests.targetinstall: $(pelts_tests_targetinstall_deps_default) # Clean # ---------------------------------------------------------------------------- -pelts_tests_clean: - rm -rf $(STATEDIR)/pelts_tests.* - rm -rf $(IMAGEDIR)/pelts_tests_* +pelts-tests_clean: + rm -rf $(STATEDIR)/pelts-tests.* + rm -rf $(IMAGEDIR)/pelts-tests_* rm -rf $(PELTS_TESTS_DIR) # vim: syntax=make diff --git a/rules/php-apc.make b/rules/php-apc.make index ac9ff851d..6fb272aab 100644 --- a/rules/php-apc.make +++ b/rules/php-apc.make @@ -74,7 +74,7 @@ $(STATEDIR)/php-apc.prepare: $(php-apc_prepare_deps_default) # FIXME: rsc: phpize path is definitely wrong here, needs to be a host tool cd $(PHP_APC_DIR) && \ $(PHP_APC_PATH) $(PHP_APC_ENV) \ - $(PTXCONF_PREFIX)/bin/phpize && \ + $(PTXCONF_SYSROOT_TARGET)/bin/phpize && \ $(PHP_APC_PATH) $(PHP_APC_ENV) \ ./configure $(PHP_APC_AUTOCONF) @$(call touch, $@) diff --git a/rules/platforms.in b/rules/platforms.in new file mode 100644 index 000000000..a82382efe --- /dev/null +++ b/rules/platforms.in @@ -0,0 +1,9 @@ +# this is to be included into the rules, so the dependency generator +# does still work + +config KERNEL + bool + +config U_BOOT_V2 + bool + diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index 9430755c3..0a91a378b 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -15,9 +15,9 @@ PTXUSER = $(shell echo $$USER) GNU_BUILD = $(shell $(PTXDIST_TOPDIR)/scripts/config.guess) GNU_HOST = $(shell echo $(GNU_BUILD) | sed s/-[a-zA-Z0-9_]*-/-host-/) -DEP_OUTPUT = depend.out -DEP_TREE_PS = deptree.ps -DEP_TREE_A4_PS = deptree-a4.ps +DEP_OUTPUT = ${PLATFORMDIR}/depend.out +DEP_TREE_PS = ${PLATFORMDIR}/deptree.ps +DEP_TREE_A4_PS = ${PLATFORMDIR}/deptree-a4.ps SUDO = sudo HOSTCC = gcc @@ -53,7 +53,7 @@ PARALLELMFLAGS ?= -j$(shell if [ -r /proc/cpuinfo ]; \ else echo 1; \ fi) -FAKEROOT := $(PTXCONF_HOST_PREFIX)/bin/fakeroot -l $(PTXCONF_HOST_PREFIX)/lib/libfakeroot.so +FAKEROOT := $(PTXCONF_SYSROOT_HOST)/bin/fakeroot -l $(PTXCONF_SYSROOT_HOST)/lib/libfakeroot.so CHECK_PIPE_STATUS = \ for i in "$${PIPESTATUS[@]}"; do [ $$i -gt 0 ] && { \ @@ -72,18 +72,18 @@ CHECK_PIPE_STATUS = \ # # SYSROOT is the directory stuff is being installed into on the host # -SYSROOT := $(call remove_quotes,$(PTXCONF_PREFIX)/sysroot/$(PTXCONF_GNU_TARGET)) +SYSROOT := $(PLATFORMDIR)/sysroot-target # # PKGDIR is the directory we install the packet sysroots and ipkgs into # -PKGDIR := $(call remove_quotes,$(PTXCONF_PREFIX)/packages/$(PTXCONF_GNU_TARGET)) +PKGDIR := $(PLATFORMDIR)/packages # # prepare the search path # In order to work correctly in cross path all local cross tools must be find first! # -CROSS_PATH := $(PTX_PREFIX_CROSS)/bin:$(PTX_PREFIX_CROSS)/sbin:$(PTX_PREFIX_HOST)/bin:$(PTX_PREFIX_HOST)/sbin:$$PATH +CROSS_PATH := $(PTXCONF_SYSROOT_CROSS)/bin:$(PTXCONF_SYSROOT_CROSS)/sbin:$(PTXCONF_SYSROOT_HOST)/bin:$(PTXCONF_SYSROOT_HOST)/sbin:$$PATH # # same as PTXCONF_GNU_TARGET, but w/o -linux @@ -92,6 +92,12 @@ CROSS_PATH := $(PTX_PREFIX_CROSS)/bin:$(PTX_PREFIX_CROSS)/sbin:$(PTX_PREFIX_HOST SHORT_TARGET := $(shell echo $(PTXCONF_GNU_TARGET) | sed -e 's/^\([^-]*\)-.*/\1/') SHORT_HOST := $(shell echo $(GNU_HOST) | sed -e 's/^\([^-]*\)-.*/\1/') +ifneq ($(PTXCONF_PLATFORM),) +PLATFORM_SUFFIX:=.$(PTXCONF_PLATFORM) +else +PLATFORM_SUFFIX:= +endif + # ---------------------------------------------------------------------------- # Environment # ---------------------------------------------------------------------------- @@ -134,9 +140,7 @@ endif # # FIXME: Consolidate a bit more # -ifndef NATIVE COMPILER_PREFIX := $(call remove_quotes,$(PTXCONF_COMPILER_PREFIX)) -endif CROSS_AR := $(COMPILER_PREFIX)ar CROSS_AS := $(COMPILER_PREFIX)as CROSS_LD := $(COMPILER_PREFIX)ld @@ -226,7 +230,7 @@ CROSS_ENV_PROGS := \ CROSS_ENV_PKG_CONFIG := \ SYSROOT=$(SYSROOT) \ - PKG_CONFIG="$(call remove_quotes,$(PTXCONF_CROSS_PREFIX)/bin/$(COMPILER_PREFIX)pkg-config)" + PKG_CONFIG="$(PTXCONF_SYSROOT_CROSS)/bin/$(COMPILER_PREFIX)pkg-config" CROSS_ENV_FLAGS := \ $(CROSS_ENV_CFLAGS) \ @@ -321,16 +325,16 @@ endif HOSTCC_ENV := CC=$(HOSTCC) HOSTCXX_ENV := CXX=$(HOSTCXX) -HOST_PATH := $(PTX_PREFIX_HOST)/bin:$(PTX_PREFIX_HOST)/sbin:$$PATH +HOST_PATH := $(PTXCONF_SYSROOT_HOST)/bin:$(PTXCONF_SYSROOT_HOST)/sbin:$$PATH -HOST_CPPFLAGS := -I$(PTX_PREFIX_HOST)/include -HOST_LDFLAGS := -L$(PTX_PREFIX_HOST)/lib -Wl,-rpath -Wl,$(PTX_PREFIX_HOST)/lib +HOST_CPPFLAGS := -I$(PTXCONF_SYSROOT_HOST)/include +HOST_LDFLAGS := -L$(PTXCONF_SYSROOT_HOST)/lib -Wl,-rpath -Wl,$(PTXCONF_SYSROOT_HOST)/lib HOST_ENV_CC := CC="$(HOSTCC)" HOST_ENV_CXX := CXX="$(HOSTCXX)" HOST_ENV_CPPFLAGS := CPPFLAGS="$(HOST_CPPFLAGS)" HOST_ENV_LDFLAGS := LDFLAGS="$(HOST_LDFLAGS)" -HOST_ENV_PKG_CONFIG := PKG_CONFIG_PATH="" PKG_CONFIG_LIBDIR="$(PTX_PREFIX_HOST)/lib/pkgconfig" +HOST_ENV_PKG_CONFIG := PKG_CONFIG_PATH="" PKG_CONFIG_LIBDIR="$(PTXCONF_SYSROOT_HOST)/lib/pkgconfig" HOST_ENV := \ $(HOST_ENV_CC) \ @@ -340,7 +344,7 @@ HOST_ENV := \ $(HOST_ENV_PKG_CONFIG) -HOST_AUTOCONF := --prefix=$(PTX_PREFIX_HOST) +HOST_AUTOCONF := --prefix=$(PTXCONF_SYSROOT_HOST) # ---------------------------------------------------------------------------- # Convenience macros @@ -399,7 +403,7 @@ add_locale = \ PREF=$(strip $(4)); \ ${CROSS_ENV_CC} $(CROSS_ENV_STRIP) \ $(SCRIPTSDIR)/make_locale.sh \ - -e $(PTX_PREFIX_HOST)/bin/localedef \ + -e $(PTXCONF_SYSROOT_HOST)/bin/localedef \ -f $$CHARMAP -i $$LOCALE_DEF \ -p $$PREF \ -n $$LOCALE_NAME @@ -1227,7 +1231,7 @@ install_finish = \ (echo "pushd $(PKGDIR)/$$PACKET.tmp/ipkg;"; \ $(AWK) -F: $(DOPERMISSIONS) $(STATEDIR)/$$PACKET.perms; echo "popd;"; \ echo -n "echo \"install_finish: packaging ipkg packet ... \"; "; \ - echo -n "$(PTXCONF_HOST_PREFIX)/bin/ipkg-build "; \ + echo -n "$(PTXCONF_SYSROOT_HOST)/bin/ipkg-build "; \ echo "$(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) $(PKGDIR)/$$PACKET.tmp/ipkg $(PKGDIR)") |$(FAKEROOT) -- 2>&1; \ $(CHECK_PIPE_STATUS) \ rm -rf $(PKGDIR)/$$PACKET.tmp; \ diff --git a/rules/python24.make b/rules/python24.make index 4eace67f3..388a26d77 100644 --- a/rules/python24.make +++ b/rules/python24.make @@ -67,7 +67,7 @@ PYTHON24_AUTOCONF := \ --enable-shared PYTHON24_MAKEVARS := \ - HOSTPYTHON=$(PTXCONF_HOST_PREFIX)/bin/python \ + HOSTPYTHON=$(PTXCONF_SYSROOT_HOST)/bin/python \ HOSTPGEN=$(HOST_PYTHON24_DIR)/Parser/pgen \ CROSS_COMPILE=yes diff --git a/rules/qte.make b/rules/qte.make index 91888f49c..ce6e0dae3 100644 --- a/rules/qte.make +++ b/rules/qte.make @@ -173,7 +173,7 @@ $(STATEDIR)/qte.prepare: $(qte_prepare_deps_default) @echo 'QMAKE_LIBS_THREAD = -lpthread' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf @echo 'QMAKE_MOC = $(QTDIR)/bin/moc' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf - @echo 'QMAKE_UIC = $(PTXCONF_PREFIX)/bin/uic' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf + @echo 'QMAKE_UIC = $(PTXCONF_SYSROOT_TARGET)/bin/uic' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf @echo 'QMAKE_AR = ar cqs' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf @echo 'QMAKE_RANLIB =' >> $(QTE_DIR)/mkspecs/linux-ptxdist/qmake.conf diff --git a/rules/rootfs.make b/rules/rootfs.make index 41a89518b..5cef79659 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -508,10 +508,10 @@ ifdef PTXCONF_ROOTFS_USER_INITTAB endif @$(call install_replace, rootfs, /etc/inittab, \ @CONSOLE@, \ - $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE))) + $(call remove_quotes,$(PTXCONF_CONSOLE_NAME))) @$(call install_replace, rootfs, /etc/inittab, \ @SPEED@, \ - $(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE_SPEED))) + $(call remove_quotes,$(PTXCONF_CONSOLE_SPEED))) endif # ----------------------------------------------------------------------------- @@ -570,9 +570,10 @@ endif # ----------------------------------------------------------------------------- ifdef PTXCONF_ROOTFS_ETC_MODULES # /etc/modules - @$(call install_copy, rootfs, 0, 0, 0644, \ - $(PTXDIST_WORKSPACE)/projectroot/etc/modules, \ - /etc/modules, n) + @file=$(PTXDIST_WORKSPACE)/projectroot/etc/modules; \ + test -f $(PTXDIST_WORKSPACE)/projectroot/etc/modules$(PLATFORM_SUFFIX) && \ + file=$(PTXDIST_WORKSPACE)/projectroot/etc/modules$(PLATFORM_SUFFIX); \ + $(call install_copy, rootfs, 0, 0, 0644, $$file, /etc/modules, n) endif # ----------------------------------------------------------------------------- diff --git a/rules/rootfs_configfiles.in b/rules/rootfs_configfiles.in index e305ae775..ce3263d4f 100644 --- a/rules/rootfs_configfiles.in +++ b/rules/rootfs_configfiles.in @@ -271,24 +271,6 @@ menuconfig ROOTFS_INITTAB See <ptxdist-install>/generic/inittab how to use them. endchoice - config ROOTFS_ETC_CONSOLE - depends on ROOTFS_INITTAB - string - default "/dev/tts/0" - prompt "start getty on this console" - help - This string will be used wherever the placeholder @CONSOLE@ in - the source file for /etc/inittab occures. - - config ROOTFS_ETC_CONSOLE_SPEED - depends on ROOTFS_INITTAB - string - default "115200" - prompt "getty baudrate" - help - This string will be used wherever the placeholder @SPEED@ in - the source file for /etc/inittab occures. - # # /etc/nsswitch # diff --git a/rules/sdl.make b/rules/sdl.make index 24a921fed..bb232a15d 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -313,8 +313,8 @@ $(STATEDIR)/sdl.install: $(sdl_install_deps_default) @$(call targetinfo, $@) @$(call install, SDL) - cp $(SDL_DIR)/sdl-config $(PTXCONF_CROSS_PREFIX)/bin/sdl-config - chmod a+x $(PTXCONF_CROSS_PREFIX)/bin/sdl-config + cp $(SDL_DIR)/sdl-config $(PTXCONF_SYSROOT_CROSS)/bin/sdl-config + chmod a+x $(PTXCONF_SYSROOT_CROSS)/bin/sdl-config @$(call touch, $@) diff --git a/rules/sdl_image.make b/rules/sdl_image.make index 9c4f0750e..d7b768668 100644 --- a/rules/sdl_image.make +++ b/rules/sdl_image.make @@ -67,7 +67,7 @@ SDL_IMAGE_ENV := $(CROSS_ENV) # FIXME: rsc: shouldn't sdl-prefix be /usr? SDL_IMAGE_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --with-sdl-prefix=$(PTXCONF_PREFIX) \ + --with-sdl-prefix=$(PTXCONF_SYSROOT_TARGET) \ --disable-sdltest \ --enable-bmp \ --enable-gif \ diff --git a/rules/template-file-make b/rules/template-file-make index 79ec5a660..09f5b65a5 100644 --- a/rules/template-file-make +++ b/rules/template-file-make @@ -67,13 +67,13 @@ $(STATEDIR)/@packet@.install: $(@packet@_install_deps_default) # # TODO: For files that are required at compiletime (headers, libs to link against) # you can copy these files to the sysroot directory. -# Use macro $(PTXCONF_PREFIX) for host files and $(PTXCONF_GNU_TARGET) +# Use macro $(PTXCONF_SYSROOT_TARGET) for host files and $(PTXCONF_GNU_TARGET) # for target files # # Example for a host header file: -# @cp friesel.h $(PTXCONF_PREFIX)/include +# @cp friesel.h $(PTXCONF_SYSROOT_TARGET)/include # Example for a host library file: -# @cp friesel.so $(PTXCONF_PREFIX)/lib +# @cp friesel.so $(PTXCONF_SYSROOT_TARGET)/lib # Example for a target file: # @cp frasel.h $(PTXCONF_GNU_TARGET)/include # Example for a target library file: diff --git a/rules/u-boot-v2.make b/rules/u-boot-v2.make index b6634dab8..4f9b28966 100644 --- a/rules/u-boot-v2.make +++ b/rules/u-boot-v2.make @@ -18,6 +18,7 @@ PACKAGES-$(PTXCONF_U_BOOT_V2) += u-boot-v2 # # handle special compilers # +ifneq ($(PTX_COMPILER_PREFIX_UBOOT),) ifneq ($(PTX_COMPILER_PREFIX),$(PTX_COMPILER_PREFIX_UBOOT)) ifeq ($(wildcard .utoolchain/$(PTX_COMPILER_PREFIX_UBOOT)gcc),) $(warning *** no .utoolchain link found. Please create a link) @@ -26,6 +27,7 @@ $(error ) endif U_BOOT_V2_TOOLCHAIN_LINK := $(PTXDIST_WORKSPACE)/.utoolchain/ endif +endif # # Paths and names @@ -122,7 +124,7 @@ u-boot-v2_install: $(STATEDIR)/u-boot-v2.install $(STATEDIR)/u-boot-v2.install: @$(call targetinfo, $@) - install -D -m755 $(U_BOOT_V2_DIR)/scripts/ubootenv $(PTX_PREFIX_HOST)/bin/ubootenv + install -D -m755 $(U_BOOT_V2_DIR)/scripts/ubootenv $(PTXCONF_SYSROOT_HOST)/bin/ubootenv @$(call touch, $@) |