diff options
27 files changed, 1 insertions, 1438 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 50df432a6..a32573f62 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -501,7 +501,6 @@ check_dirs() { for dir in \ "${BUILDDIR}" \ "${CROSS_BUILDDIR}" \ - "${KLIBC_BUILDDIR}" \ "${HOST_BUILDDIR}" \ "${STATEDIR}" \ "${IMAGEDIR}" \ @@ -518,7 +517,6 @@ check_dirs() { for dir in \ "${BUILDDIR}" \ "${CROSS_BUILDDIR}" \ - "${KLIBC_BUILDDIR}" \ "${HOST_BUILDDIR}" \ ; do local testfile_lower="${dir}/.secret-world-domination-project" @@ -1115,7 +1113,7 @@ clean() { echo echo "${PTXDIST_LOG_PROMPT}removing build directories..." - for dir in "${BUILDDIR}" "${CROSS_BUILDDIR}" "${KLIBC_BUILDDIR}" "${HOST_BUILDDIR}"; do + for dir in "${BUILDDIR}" "${CROSS_BUILDDIR}" "${HOST_BUILDDIR}"; do if [ ! -d "${dir}" ]; then continue fi diff --git a/doc/dev_manual.rst b/doc/dev_manual.rst index 05a0f6442..92106fd28 100644 --- a/doc/dev_manual.rst +++ b/doc/dev_manual.rst @@ -149,9 +149,6 @@ handle: - **cross type**: This kind of package is built for the build host, but creates architecture specific data for the target. -- **klibc type**: This kind of package is built against klibc to be - part of an initramfs for the target. - - **src-autoconf-prog**: This kind of package is built for the target. It is intended for development, as it does not handle a released archive but a plain source project instead. Creating such a package @@ -679,7 +676,6 @@ available: ./apache2.in:## SECTION=networking ./apache2_mod_python.in:## SECTION=networking [...] - ./klibc-module-init-tools.in:## SECTION=initramfs ./xkeyboard-config.in:## SECTION=multimedia_xorg_data ./xorg-app-xev.in:## SECTION=multimedia_xorg_app ./xorg-app-xrandr.in:## SECTION=multimedia_xorg_app diff --git a/patches/klibc-2.0.3/0001-klibc-use-kernel-header-installed-by-headers_install.patch b/patches/klibc-2.0.3/0001-klibc-use-kernel-header-installed-by-headers_install.patch deleted file mode 100644 index e9795b3e3..000000000 --- a/patches/klibc-2.0.3/0001-klibc-use-kernel-header-installed-by-headers_install.patch +++ /dev/null @@ -1,60 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 5 Jan 2009 17:46:47 +0100 -Subject: [PATCH 17/21] [klibc] use kernel header installed by "headers_install" - -Originally klibc directly sets the compiler header search path -directly into the kernel tree. This causes compilation to fail on modern -kernel with a changed include dir layout. - -This patch uses the "headers_install" to extract the includes from the -kernel. Against these headers klibc is build. - -Ported from 1.5.15 - -Index: klibc-1.5.25/Makefile -=================================================================== ---- klibc-1.5.25.orig/Makefile -+++ klibc-1.5.25/Makefile -@@ -6,6 +6,7 @@ SRCROOT = . - # kbuild compatibility - export srctree := $(shell pwd) - export objtree := $(shell pwd) -+export LINUX_HEADERS := $(objtree)/linux-headers - export KLIBCSRC := usr/klibc - export VERSION := $(shell cat $(srctree)/$(KLIBCSRC)/version) - export KLIBCINC := usr/include -@@ -102,16 +103,19 @@ $(KLIBCKERNELSRC): - @echo "KLIBCKERNELSRC=<path> to the build." - @false - -+$(LINUX_HEADERS): linux -+ $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH="$@" headers_install -+ - rpmbuild = $(shell which rpmbuild 2>/dev/null || which rpm) - - klibc.spec: klibc.spec.in $(KLIBCSRC)/version - sed -e 's/@@VERSION@@/$(VERSION)/g' < $< > $@ - - # Build klcc - it is the first target --klcc: $(objtree)/.config -+klcc: $(objtree)/.config $(LINUX_HEADERS) - $(Q)$(MAKE) $(klibc)=klcc - --klibc: $(objtree)/.config -+klibc: $(objtree)/.config $(LINUX_HEADERS) - $(Q)$(MAKE) $(klibc)=. - - test: klibc -Index: klibc-1.5.25/scripts/Kbuild.klibc -=================================================================== ---- klibc-1.5.25.orig/scripts/Kbuild.klibc -+++ klibc-1.5.25/scripts/Kbuild.klibc -@@ -113,7 +113,7 @@ KLIBCCPPFLAGS := -nostdinc -iwithpref - # kernel include paths - KLIBCKERNELSRC ?= $(srctree) - KLIBCKERNELOBJ ?= $(objtree) --KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ -+KLIBCCPPFLAGS += -I$(LINUX_HEADERS)/include \ - $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ - -I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ - $(KLIBCARCHINCFLAGS) diff --git a/patches/klibc-2.0.3/0002-Patch-to-add-support-for-detection-of-vfat-and-jffs2.patch b/patches/klibc-2.0.3/0002-Patch-to-add-support-for-detection-of-vfat-and-jffs2.patch deleted file mode 100644 index 60f1d8fac..000000000 --- a/patches/klibc-2.0.3/0002-Patch-to-add-support-for-detection-of-vfat-and-jffs2.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6b24aece3e313aece16ce60255e918963b0905b3 Mon Sep 17 00:00:00 2001 -From: Jon Ringle <jon@ringle.org> -Date: Thu, 29 Oct 2009 16:27:11 +0100 -Subject: [PATCH 18/21] Patch to add support for detection of vfat and jffs2 images. - -Obtained from openembedded: -http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/klibc/klibc-1.5.15/fstype-sane-vfat-and-jffs2-for-1.5.patch - -Signed-off-by: Jon Ringle <jon@ringle.org> -[mkl: fixed compiler warnings] -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - usr/kinit/fstype/fstype.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -diff --git a/usr/kinit/fstype/fstype.c b/usr/kinit/fstype/fstype.c -index 69e0e30..d06bcd1 100644 ---- a/usr/kinit/fstype/fstype.c -+++ b/usr/kinit/fstype/fstype.c -@@ -59,6 +59,26 @@ - /* Swap needs the definition of block size */ - #include "swap_fs.h" - -+static int jffs2_image(const void *buf, unsigned long long *bytes) -+{ -+ const unsigned char *cbuf = buf; -+ -+ if (cbuf[0] == 0x85 && cbuf[1] == 0x19) -+ return 1; -+ -+ return 0; -+} -+ -+static int vfat_image(const void *buf, unsigned long long *bytes) -+{ -+ if (!strncmp(buf + 54, "FAT12 ", 8) -+ || !strncmp(buf + 54, "FAT16 ", 8) -+ || !strncmp(buf + 82, "FAT32 ", 8)) -+ return 1; -+ -+ return 0; -+} -+ - static int gzip_image(const void *buf, unsigned long long *bytes) - { - const unsigned char *p = buf; -@@ -492,6 +512,8 @@ static struct imagetype images[] = { - {1, "minix", minix_image}, - {1, "nilfs2", nilfs2_image}, - {2, "ocfs2", ocfs2_image}, -+ {0, "jffs2", jffs2_image}, -+ {0, "vfat", vfat_image}, - {8, "reiserfs", reiserfs_image}, - {64, "reiserfs", reiserfs_image}, - {64, "reiser4", reiser4_image}, --- -1.6.5 - diff --git a/patches/klibc-2.0.3/0003-define-__socklen_t_defined.patch b/patches/klibc-2.0.3/0003-define-__socklen_t_defined.patch deleted file mode 100644 index cf7814be7..000000000 --- a/patches/klibc-2.0.3/0003-define-__socklen_t_defined.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Jon Ringle <jon@ringle.org> -Subject: define "__socklen_t_defined" - -Port from 1.5.15 - -Index: klibc-1.5.25/usr/include/sys/socket.h -=================================================================== ---- klibc-1.5.25.orig/usr/include/sys/socket.h -+++ klibc-1.5.25/usr/include/sys/socket.h -@@ -152,6 +152,7 @@ struct sockaddr { - char sa_data[14]; /* 14 bytes of protocol address */ - }; - typedef int socklen_t; -+#define __socklen_t_defined 1 - struct msghdr { - void *msg_name; - int msg_namelen; diff --git a/patches/klibc-2.0.3/0004-fix-warning-include-signal.h-47-5-warning-SIGRTMAX-i.patch b/patches/klibc-2.0.3/0004-fix-warning-include-signal.h-47-5-warning-SIGRTMAX-i.patch deleted file mode 100644 index 09cbd2ddc..000000000 --- a/patches/klibc-2.0.3/0004-fix-warning-include-signal.h-47-5-warning-SIGRTMAX-i.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e3cbc39bf1a94056f4a4bbae0067109d0317e68b Mon Sep 17 00:00:00 2001 -From: Jon Ringle <jon@ringle.org> -Date: Thu, 29 Oct 2009 16:27:14 +0100 -Subject: [PATCH 20/21] fix warning include/signal.h:47:5: warning: "SIGRTMAX" is not defined - -Signed-off-by: Jon Ringle <jon@ringle.org> -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - usr/include/signal.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/usr/include/signal.h b/usr/include/signal.h -index a513282..4ed65bc 100644 ---- a/usr/include/signal.h -+++ b/usr/include/signal.h -@@ -44,10 +44,12 @@ typedef int sig_atomic_t; - /* The kernel header files are inconsistent whether or not - SIGRTMAX is inclusive or exclusive. POSIX seems to state that - it's inclusive, however. */ -+#ifdef SIGRTMAX - #if SIGRTMAX >= _NSIG - # undef SIGRTMAX - # define SIGRTMAX (_NSIG-1) - #endif -+#endif - - __extern const char *const sys_siglist[_NSIG]; - __extern const char *const sys_sigabbrev[_NSIG]; --- -1.6.5 - diff --git a/patches/klibc-2.0.3/series b/patches/klibc-2.0.3/series deleted file mode 100644 index b4b923382..000000000 --- a/patches/klibc-2.0.3/series +++ /dev/null @@ -1,4 +0,0 @@ -0001-klibc-use-kernel-header-installed-by-headers_install.patch -0002-Patch-to-add-support-for-detection-of-vfat-and-jffs2.patch -0003-define-__socklen_t_defined.patch -0004-fix-warning-include-signal.h-47-5-warning-SIGRTMAX-i.patch diff --git a/rules/Kconfig b/rules/Kconfig index 19bcdb71e..f7f26ef23 100644 --- a/rules/Kconfig +++ b/rules/Kconfig @@ -39,13 +39,6 @@ menu "Core (libc, locales) " source "generated/core.in" endmenu -menuconfig CORE_INITRAMFS - bool "Core (initramfs) " -if CORE_INITRAMFS -source "generated/initramfs.in" -endif - - comment "------------------------------------" menu "Shell & Console Tools " diff --git a/rules/initmethod.in b/rules/initmethod.in index 676cc0af2..c1ef054df 100644 --- a/rules/initmethod.in +++ b/rules/initmethod.in @@ -26,10 +26,6 @@ choice select SYSTEMD prompt "systemd " - config INITMETHOD_INITRAMFS - bool - prompt "initramfs init " - endchoice source "generated/initmethod.in" diff --git a/rules/initramfs-kernel-modules.in b/rules/initramfs-kernel-modules.in deleted file mode 100644 index 59ca0ab1d..000000000 --- a/rules/initramfs-kernel-modules.in +++ /dev/null @@ -1,29 +0,0 @@ -## SECTION=initramfs - -menuconfig INITRAMFS_KERNEL_MODULES - bool - prompt "initramfs-kernel-modules " - select KLIBC - -if INITRAMFS_KERNEL_MODULES - -choice - prompt "install kernel modules" - help - FIXME - -config INITRAMFS_KERNEL_MODULES_ALL - bool - prompt "all" - help - FIXME - -config INITRAMFS_KERNEL_MODULES_USER_SPEC - bool - prompt "list from $(PTXDIST_WORKSPACE)/initramfs_modules" - help - FIXME - -endchoice - -endif diff --git a/rules/initramfs-kernel-modules.make b/rules/initramfs-kernel-modules.make deleted file mode 100644 index ed188614f..000000000 --- a/rules/initramfs-kernel-modules.make +++ /dev/null @@ -1,95 +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. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_INITRAMFS_KERNEL_MODULES) += initramfs-kernel-modules - -# -# Paths and names -# -INITRAMFS_KERNEL_MODULES_VERSION := 1.0.0 -INITRAMFS_KERNEL_MODULES := initramfs-kernel-modules-$(INITRAMFS_KERNEL_MODULES_VERSION) -INITRAMFS_KERNEL_MODULES_DIR := $(KLIBC_BUILDDIR)/$(INITRAMFS_KERNEL_MODULES) - -ifdef PTXCONF_KLIBC_MODULE_INIT_TOOLS -$(STATEDIR)/klibc.targetinstall.post: $(STATEDIR)/initramfs-kernel-modules.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-kernel-modules.extract: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -INITRAMFS_KERNEL_MODULES_PATH := PATH=$(CROSS_PATH) -INITRAMFS_KERNEL_MODULES_ENV := $(CROSS_ENV) - -$(STATEDIR)/initramfs-kernel-modules.prepare: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-kernel-modules.compile: $(STATEDIR)/kernel.prepare - @$(call targetinfo) - cd $(KERNEL_DIR) && $(KERNEL_PATH) $(MAKE) \ - $(KERNEL_MAKEVARS) $(PTXCONF_KERNEL_MODULES_BUILD) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-kernel-modules.install: - @$(call targetinfo) - @$(call clean, $(INITRAMFS_KERNEL_MODULES_PKGDIR)) - @cd $(KERNEL_DIR) && $(KERNEL_PATH) $(MAKE) \ - $(filter-out INSTALL_MOD_PATH=%,$(KERNEL_MAKEVARS)) \ - INSTALL_MOD_PATH=$(INITRAMFS_KERNEL_MODULES_PKGDIR) \ - modules_install - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-kernel-modules.targetinstall: - @$(call targetinfo) - @cd $(INITRAMFS_KERNEL_MODULES_PKGDIR) && \ - find lib -type d | while read dir; do \ - $(call install_initramfs, initramfs-kernel-modules, 0, 0, 0755, /$${dir}); \ - done - -ifdef PTXCONF_INITRAMFS_KERNEL_MODULES_ALL - @cd $(INITRAMFS_KERNEL_MODULES_PKGDIR) && \ - find lib -type f | while read file; do \ - $(call install_initramfs, initramfs-kernel-modules, 0, 0, 0644, -, /$${file}); \ - done -endif - -ifdef PTXCONF_INITRAMFS_KERNEL_MODULES_USER_SPEC - cat $(PTXDIST_WORKSPACE)/initramfs_modules | while read file; do \ - $(call install_initramfs, initramfs-kernel-modules, 0, 0, 0644, -, /$${file}); \ - done -endif - @$(call touch) - -# vim: syntax=make diff --git a/rules/initramfs-tools.in b/rules/initramfs-tools.in deleted file mode 100644 index 4201a2a41..000000000 --- a/rules/initramfs-tools.in +++ /dev/null @@ -1,69 +0,0 @@ -## SECTION=initmethod - -if INITMETHOD_INITRAMFS - -menuconfig INITRAMFS_TOOLS - bool - prompt "initramfs-tools " - help - Install initramfs skeleton framework - -if INITRAMFS_TOOLS - -config INITRAMFS_SPEC - bool - prompt "parse project specific initramfs_spec" - help - parse the spec file which is expected to live in - ${PTXDIST_WORKSPACE}/initramfs_spec. The format is the same - as described in the kernelsource under - - Documentation/early-userspace/README. - - Files described in this file can either have an absolute or - a relative path (relative to ${PTXDIST_WORKSPACE}). - -if INITRAMFS_SPEC - -config INITRAMFS_SPEC_FILE - string "initramfs spec filename" - default "${PTXDIST_WORKSPACE}/initramfs_spec" - help - install using a spec file. Format is similar to what - is described in the kernel source in - Documentation/filesystems/ramfs-rootfs-initramfs.txt - - file <name> <location> <mode> <uid> <gid> - dir <name> <mode> <uid> <gid> - nod <name> <mode> <uid> <gid> <dev_type> <maj> <min> - slink <name> <target> <mode> <uid> <gid> - - file <location> can either have an absolute path or - a relative path relative to any of the following paths: - ${PTXDIST_WORKSPACE}/projectroot${PTXDIST_PLATFORMSUFFIX}/<location> - ${PTXDIST_WORKSPACE}/projectroot/<location>${PTXDIST_PLATFORMSUFFIX} - ${PTXDIST_WORKSPACE}/projectroot/<location> - ${PTXDIST_TOPDIR}/projectroot/<location> - ${pkg_pkg_dir}/<location> - ${pkg_dir}/<location> - -endif - -config INITRAMFS_TOOLS_SCRIPTS_INIT - bool "install /scripts/init " - help - FIXME - -config INITRAMFS_TOOLS_SCRIPTS_LOCAL - bool "install /scripts/local " - help - FIXME - -config INITRAMFS_TOOLS_SCRIPTS_NFS - bool "install /scripts/nfs " - help - FIXME - -endif - -endif diff --git a/rules/initramfs-tools.make b/rules/initramfs-tools.make deleted file mode 100644 index bf2fe7ffe..000000000 --- a/rules/initramfs-tools.make +++ /dev/null @@ -1,110 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Jon Ringle <jon@ringle.org> -# -# 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_INITRAMFS_TOOLS) += initramfs-tools - -# -# Paths and names -# -INITRAMFS_TOOLS_VERSION := 0.93.4 -INITRAMFS_TOOLS_MD5 := 06415435a4ba85713ea50b34e212d73c -INITRAMFS_TOOLS_SUFFIX := tar.gz -INITRAMFS_TOOLS := initramfs-tools -INITRAMFS_TOOLS_TARBALL := $(INITRAMFS_TOOLS)_$(INITRAMFS_TOOLS_VERSION).$(INITRAMFS_TOOLS_SUFFIX) -INITRAMFS_TOOLS_URL := http://www.pengutronix.de/software/ptxdist/temporary-src/$(INITRAMFS_TOOLS_TARBALL) -INITRAMFS_TOOLS_SOURCE := $(SRCDIR)/$(INITRAMFS_TOOLS_TARBALL) -INITRAMFS_TOOLS_DIR := $(BUILDDIR)/$(INITRAMFS_TOOLS) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-tools.prepare: - @$(call targetinfo) - @echo "DPKG_ARCH=$(PTXCONF_ARCH_STRING)" > $(INITRAMFS_TOOLS_DIR)/conf/arch.conf - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-tools.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-tools.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-tools.targetinstall: - @$(call targetinfo) - - @$(call install_init, initramfs-tools) - @$(call install_fixup, initramfs-tools,PRIORITY,optional) - @$(call install_fixup, initramfs-tools,SECTION,base) - @$(call install_fixup, initramfs-tools,AUTHOR,"Jon Ringle <jon@ringle.org>") - @$(call install_fixup, initramfs-tools,DESCRIPTION,missing) - - @$(call install_copy, initramfs-tools, 0, 0, 0755, /conf); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /conf/conf.d); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /init); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /conf/initramfs.conf); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /conf/arch.conf); - - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/init-top); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/init-premount); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/init-bottom); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /scripts/functions); - -ifdef PTXCONF_INITRAMFS_TOOLS_SCRIPTS_INIT - @cd $(INITRAMFS_TOOLS_DIR) && \ - find scripts/init-* -type f | while read file; do \ - $(call install_alternative, initramfs-tools, 0, 0, 0755, /$${file}); \ - done -endif - -ifdef PTXCONF_INITRAMFS_TOOLS_SCRIPTS_LOCAL - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/local-top); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/local-premount); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/local-bottom); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /scripts/local); - @cd $(INITRAMFS_TOOLS_DIR) && \ - find scripts/local-* -type f | while read file; do \ - $(call install_alternative, initramfs-tools, 0, 0, 0755, /$${file}); \ - done -endif - -ifdef PTXCONF_INITRAMFS_TOOLS_SCRIPTS_NFS - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/nfs-top); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/nfs-premount); - @$(call install_copy, initramfs-tools, 0, 0, 0755, /scripts/nfs-bottom); - @$(call install_alternative, initramfs-tools, 0, 0, 0755, /scripts/nfs); -endif - -ifdef PTXCONF_INITRAMFS_SPEC - @$(call install_spec, initramfs-tools, $(PTXCONF_INITRAMFS_SPEC_FILE)); -endif - - @$(call install_finish, initramfs-tools) - @$(call touch) - -# vim: syntax=make diff --git a/rules/initramfs-user-spec.make b/rules/initramfs-user-spec.make deleted file mode 100644 index 3b4379a15..000000000 --- a/rules/initramfs-user-spec.make +++ /dev/null @@ -1,47 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Jon Ringle <jon@ringle.org> -# (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_INITRAMFS_USER_SPEC) += initramfs-user-spec - -# -# Dummy to keep ipkg happy -# -INITRAMFS_USER_SPEC_VERSION := $(INITRAMFS_TOOLS_VERSION) - -ifdef PTXCONF_INITRAMFS_USER_SPEC -$(STATEDIR)/klibc.targetinstall.post: $(STATEDIR)/initramfs-user-spec.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/initramfs-user-spec.targetinstall: $(STATEDIR)/klibc.targetinstall - @$(call targetinfo) -# -# adding user specific files to the list last -# Note: files without a leading '/' get a prefix path of $(PTXDIST_WORKSPACE)/initramfs -# - cat $(PTXDIST_WORKSPACE)/initramfs_spec | while read type target source rest; do \ - if [ "$$type" == "file" ]; then \ - if [ "$$(echo "$$source" | grep "^/")" == "" ]; then \ - source=$(PTXDIST_WORKSPACE)/initramfs/$$source; \ - fi; \ - fi; \ - echo "$$type $$target $$source $$rest" >> $(INITRAMFS_CONTROL); \ - done - - @$(call touch) - -# vim: syntax=make diff --git a/rules/kernel.make b/rules/kernel.make index d69224005..d51b6c039 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -117,7 +117,6 @@ endif # file for now. the rootfs isn't build yet. # KERNEL_INITRAMFS_SOURCE_$(PTXCONF_IMAGE_KERNEL_INITRAMFS) += $(STATEDIR)/empty.cpio -KERNEL_INITRAMFS_SOURCE_$(PTXCONF_KLIBC) += $(INITRAMFS_CONTROL) $(STATEDIR)/kernel.prepare: $(KERNEL_CONFIG) @$(call targetinfo) diff --git a/rules/klibc.in b/rules/klibc.in deleted file mode 100644 index 6956e0882..000000000 --- a/rules/klibc.in +++ /dev/null @@ -1,268 +0,0 @@ -## SECTION=initramfs - -# -# rules/klibc.in -# -menuconfig KLIBC - bool - prompt "klibc " - help - This feature contains a collection of programs that are - linked against klibc. These duplicate some of the - functionality of a regular Linux toolset, but are typically - much smaller than their full-function counterparts. They are - intended for inclusion in initramfs images and can do the - network configuration outside the kernel and someting - special before mounting the final root filesystem. - -if KLIBC - -choice - prompt "link klibc programs" - help - You can select how to link the klibc programs. - - There are two possibilities, either links shared or - static. When linking statically the klibc is linked into - each program. Select this if you only have a few - programs. On the other hand if you have many tools a - dynamically linked klibc saves some space. - -config KLIBC_SHARED - bool "shared" - -config KLIBC_STATIC - bool "static" - -endchoice - -config KLIBC_DASH - bool - prompt "dash" - help - install a minimum shell (dash) under /bin/sh - -config KLIBC_INIT - string - prompt "create a link from /init to the specified program" - default "/kinit" - help - A kernel will always start /init in the initramfs if not - otherwise specified (see kernel parameter "init="). With - this link ist possible to start any program you like. - -menu "klibc utils" - -config KLIBC_CAT - bool - prompt "cat" - help - This is a "cat" command. It gets installed into /bin/cat - -config KLIBC_CHROOT - bool - prompt "chroot" - help - This is a "chroot" command. It gets installed into /bin/chroot - -config KLIBC_CPIO - bool - prompt "cpio" - help - This is a "cpio" command. It gets installed into /bin/cpio - -config KLIBC_DD - bool - prompt "dd" - help - This is a "dd" command. It gets installed into /bin/dd - -config KLIBC_DMESG - bool - prompt "dmesg" - help - This is a "dmesg" command. It gets installed into /bin/dmesg - -config KLIBC_FALSE - bool - prompt "false" - help - This is a "false" command. It gets installed into /bin/false - -config KLIBC_HALT - bool - prompt "halt" - help - This is a "halt" command. It gets installed into /bin/halt - -config KLIBC_KILL - bool - prompt "kill" - help - This is a "kill" command. It gets installed into /bin/kill - -config KLIBC_LN - bool - prompt "ln" - help - This is a "ln" command. It gets installed into /bin/ln - -config KLIBC_LS - bool - prompt "ls" - help - This is a "ls" command. It gets installed into /bin/ln - -config KLIBC_MINIPS - bool - prompt "minips" - help - This is a "minips" command. It gets installed into /bin/minips - -config KLIBC_MKDIR - bool - prompt "mkdir" - help - This is a "mkdir" command. It gets installed into /bin/mkdir - -config KLIBC_MKFIFO - bool - prompt "mkfifo" - help - This is a "mkfifo" command. It gets installed into /bin/mkfifo - -config KLIBC_MKNOD - bool - prompt "mknod" - help - This is a "mknod" command. It gets installed into /bin/mknod - -config KLIBC_MOUNT - bool - prompt "mount" - help - This is a "mount" command. It gets installed into /bin/mount - -config KLIBC_NUKE - bool - prompt "nuke" - help - This is a "nuke" command. It gets installed into /bin/nuke - -config KLIBC_PIVOT_ROOT - bool - prompt "pivot_root" - help - This is a "pivot_root" command. It gets installed into /bin/pivot_root - -config KLIBC_POWEROFF - bool - prompt "poweroff" - help - This is a "poweroff" command. It gets installed into /bin/poweroff - -config KLIBC_READLINK - bool - prompt "readlink" - help - This is a "readlink" command. It gets installed into /bin/readlink - -config KLIBC_REBOOT - bool - prompt "reboot" - help - This is a "reboot" command. It gets installed into /bin/reboot - -config KLIBC_SLEEP - bool - prompt "sleep" - help - This is a "sleep" command. It gets installed into /bin/sleep - -config KLIBC_SYNC - bool - prompt "sync" - help - This is a "sync" command. It gets installed into /bin/sync - -config KLIBC_TRUE - bool - prompt "true" - help - This is a "true" command. It gets installed into /bin/true - -config KLIBC_UMOUNT - bool - prompt "umount" - help - This is a "umount" command. It gets installed into /bin/umount - -config KLIBC_UNAME - bool - prompt "uname" - help - This is a "uname" command. It gets installed into /bin/uname - -endmenu - - -menu "klibc init" - -config KLIBC_FSTYPE - bool - prompt "fstype" - help - This is a "fstype" command. It gets installed into /bin/fstype - -config KLIBC_IPCONFIG - bool - prompt "ipconfig" - help - This is a "ipconfig" command. It gets installed into /bin/ipconfig - -config KLIBC_KINIT - bool - prompt "kinit" - default y - help - It will be installed into /kinit and is intended to - configure the network and mounting NFS based filesystems. It - will be controlled by the standard kernel command line, - anything else in /arch.cmd and anything else after a -- - parameter. All three parts gets combined into one parameter - list and will be used for configuration. - -config KLIBC_NFSMOUNT - bool - prompt "nfsmount" - help - This is a "nfsmount" command. It gets installed into /bin/nfsmount - -config KLIBC_RESUME - bool - prompt "resume" - help - This is a "resume" command. It gets installed into /bin/resume - -config KLIBC_RUN_INIT - bool - prompt "run-init" - default y - help - It will be installed into /bin/run-init. - Usage: exec run-init [-c /dev/console] /real-root /sbin/init "$@" - - This program should be called as the last thing in a shell - script acting as /init in an initramfs; it does the - following: - - - Delete all files in the initramfs; - - Remounts /real-root onto the root filesystem; - - Chroots; - - Opens /dev/console; - - Spawns the specified init program (with arguments.) - -endmenu - -endif - diff --git a/rules/klibc.make b/rules/klibc.make deleted file mode 100644 index b5ee38096..000000000 --- a/rules/klibc.make +++ /dev/null @@ -1,195 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2005 by Sascha Hauer -# 2009 by Jon Ringle <jon@ringle.org> -# 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. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_KLIBC) += klibc - -# -# Paths and names -# -KLIBC_VERSION := 2.0.3 -KLIBC_MD5 := 5dc3fbee62c087048fd8338741474194 -KLIBC := klibc-$(KLIBC_VERSION) -KLIBC_SUFFIX := tar.gz -KLIBC_SOURCE := $(SRCDIR)/$(KLIBC).$(KLIBC_SUFFIX) -KLIBC_DIR := $(BUILDDIR)/$(KLIBC) - -KLIBC_URL := \ - $(call ptx/mirror, KERNEL, libs/klibc/2.0/$(KLIBC).$(KLIBC_SUFFIX)) - -ifdef PTXCONF_KLIBC -$(STATEDIR)/kernel.compile: $(STATEDIR)/klibc.targetinstall.post -endif - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -$(STATEDIR)/klibc.prepare: $(STATEDIR)/kernel.prepare - @$(call targetinfo) - @echo > $(KLIBC_DIR)/defconfig - @echo "CONFIG_KLIBC=y" >> $(KLIBC_DIR)/defconfig - @echo "CONFIG_KLIBC_ERRLIST=y" >> $(KLIBC_DIR)/defconfig - @echo "CONFIG_KLIBC_ZLIB=y" >> $(KLIBC_DIR)/defconfig -ifdef PTXCONF_ARCH_ARM - @echo "# ARM options" >> $(KLIBC_DIR)/defconfig - @echo "# CONFIG_KLIBC_THUMB is not set" >> $(KLIBC_DIR)/defconfig - @echo "CONFIG_AEABI=y" >> $(KLIBC_DIR)/defconfig -endif -ifdef PTXCONF_ARCH_X86 - @echo "# i386 option" >> $(KLIBC_DIR)/defconfig - @echo "CONFIG_REGPARM=y" >> $(KLIBC_DIR)/defconfig -endif - @ln -sf $(KERNEL_DIR) $(KLIBC_DIR)/linux - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -KLIBC_MAKEVARS := \ - $(PARALLELMFLAGS) \ - KLIBCARCH=$(PTXCONF_KERNEL_ARCH_STRING) \ - CROSS_COMPILE=$(COMPILER_PREFIX) \ - INSTALLROOT=$(PTXDIST_SYSROOT_TARGET) - -$(STATEDIR)/klibc.compile: - @$(call targetinfo) - @rm -f $(KLIBC_DIR)/.config - @cd $(KLIBC_DIR) && $(MAKE) $(KLIBC_MAKEVARS) prefix=$(PTXDIST_SYSROOT_TARGET)/usr - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/klibc.install: - @$(call targetinfo) - - @rm -f $(KLIBC_DIR)/.config - @install $(KLIBC_DIR)/klcc/klcc $(PTXCONF_SYSROOT_CROSS)/bin/klcc - @cd $(KLIBC_DIR) && $(MAKE) $(KLIBC_MAKEVARS) install - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -KLIBC_BINSRC := $(KLIBC_DIR)/usr - -KLIBC_UTILS-$(PTXCONF_KLIBC_CAT) += cat -KLIBC_UTILS-$(PTXCONF_KLIBC_CHROOT) += chroot -KLIBC_UTILS-$(PTXCONF_KLIBC_CPIO) += cpio -KLIBC_UTILS-$(PTXCONF_KLIBC_DD) += dd -KLIBC_UTILS-$(PTXCONF_KLIBC_DMESG) += dmesg -KLIBC_UTILS-$(PTXCONF_KLIBC_FALSE) += false -KLIBC_UTILS-$(PTXCONF_KLIBC_HALT) += halt -KLIBC_UTILS-$(PTXCONF_KLIBC_KILL) += kill -KLIBC_UTILS-$(PTXCONF_KLIBC_LN) += ln -KLIBC_UTILS-$(PTXCONF_KLIBC_LS) += ls -KLIBC_UTILS-$(PTXCONF_KLIBC_MINIPS) += minips -KLIBC_UTILS-$(PTXCONF_KLIBC_MKDIR) += mkdir -KLIBC_UTILS-$(PTXCONF_KLIBC_MKFIFO) += mkfifo -KLIBC_UTILS-$(PTXCONF_KLIBC_MKNOD) += mknod -KLIBC_UTILS-$(PTXCONF_KLIBC_MOUNT) += mount -KLIBC_UTILS-$(PTXCONF_KLIBC_NUKE) += nuke -KLIBC_UTILS-$(PTXCONF_KLIBC_PIVOT_ROOT) += pivot_root -KLIBC_UTILS-$(PTXCONF_KLIBC_POWEROFF) += poweroff -KLIBC_UTILS-$(PTXCONF_KLIBC_READLINK) += readlink -KLIBC_UTILS-$(PTXCONF_KLIBC_REBOOT) += reboot -KLIBC_UTILS-$(PTXCONF_KLIBC_SLEEP) += sleep -KLIBC_UTILS-$(PTXCONF_KLIBC_SYNC) += sync -KLIBC_UTILS-$(PTXCONF_KLIBC_TRUE) += true -KLIBC_UTILS-$(PTXCONF_KLIBC_UMOUNT) += umount -KLIBC_UTILS-$(PTXCONF_KLIBC_UNAME) += uname - -KLIBC_KINIT-$(PTXCONF_KLIBC_FSTYPE) += fstype -KLIBC_KINIT-$(PTXCONF_KLIBC_IPCONFIG) += ipconfig -#KLIBC_KINIT-$(PTXCONF_KLIBC_KINIT) += # kinit is copied to / -KLIBC_KINIT-$(PTXCONF_KLIBC_NFSMOUNT) += nfsmount -KLIBC_KINIT-$(PTXCONF_KLIBC_RESUME) += resume -KLIBC_KINIT-$(PTXCONF_KLIBC_RUN_INIT) += run-init - -ifdef PTXCONF_KLIBC_STATIC -KLIBC_SUBDIR := static -KLIBC_EXT := -else -KLIBC_SUBDIR := shared -KLIBC_EXT := .shared -endif - -$(STATEDIR)/klibc.targetinstall: - @$(call targetinfo) - - @echo "# Generated initramfs" > $(INITRAMFS_CONTROL) - - @$(call install_initramfs, klibc, 0, 0, 0755, /bin); - @$(call install_initramfs, klibc, 0, 0, 0755, /dev); - @$(call install_initramfs, klibc, 0, 0, 0755, /etc); - @$(call install_initramfs, klibc, 0, 0, 0755, /lib); - @$(call install_initramfs, klibc, 0, 0, 0755, /proc); - @$(call install_initramfs, klibc, 0, 0, 0755, /sbin); - @$(call install_initramfs, klibc, 0, 0, 0755, /sys); - - @$(call install_initramfs_node, klibc, 0, 0, 0600, c, 5, 1, /dev/console); - - @for prog in $(KLIBC_UTILS-y); do \ - $(call install_initramfs, klibc, 0, 0, 0755, \ - $(KLIBC_DIR)/usr/utils/$(KLIBC_SUBDIR)/$${prog}, /bin/$${prog}); \ - done - - @for prog in $(KLIBC_KINIT-y); do \ - $(call install_initramfs, klibc, 0, 0, 0755, \ - $(KLIBC_DIR)/usr/kinit/$${prog}/$(KLIBC_SUBDIR)/$${prog}, /bin/$${prog}); \ - done - -ifdef PTXCONF_KLIBC_KINIT - @$(call install_initramfs, klibc, 0, 0, 0755, \ - $(KLIBC_DIR)/usr/kinit/kinit$(KLIBC_EXT), /kinit); -endif - -ifdef PTXCONF_KLIBC_DASH - @$(call install_initramfs, klibc, 0, 0, 0755, \ - $(KLIBC_DIR)/usr/dash/sh$(KLIBC_EXT), /bin/sh); -endif - -ifdef PTXCONF_KLIBC_SHARED - @for lib in $(KLIBC_DIR)/usr/klibc/klibc-*.so; do \ - $(call install_initramfs, klibc, 0, 0, 0755, \ - $${lib}, /lib/$$(basename $${lib})); \ - done -endif - -# -# add the link when enabled -# -ifneq ($(call remove_quotes,$(PTXCONF_KLIBC_INIT)),) - @$(call install_initramfs_link, klibc, /init, $(PTXCONF_KLIBC_INIT)); -endif - - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/klibc.clean: - @$(call targetinfo) - @$(call clean_pkg, KLIBC) - rm -f $(PTXCONF_SYSROOT_CROSS)/bin/klcc - rm -rf $(SYSROOT)/usr/lib/klibc - rm -rf $(INITRAMFS_CONTROL) - -# vim: syntax=make diff --git a/rules/post/install_initramfs.make b/rules/post/install_initramfs.make deleted file mode 100644 index 8377be12b..000000000 --- a/rules/post/install_initramfs.make +++ /dev/null @@ -1,158 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2005, 2006, 2007 Robert Schwebel <r.schwebel@pengutronix.de> -# 2008, 2009 by Marc Kleine-Budde <mkl@pengutronix.de> -# 2009 by Jon Ringle <jon@ringle.org> -# -# 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. -# - -# -# install_initramfs -# -# Installs a file with user/group ownership and permissions via -# initramfs. -# -# $1: packet label (not used) -# $2: UID -# $3: GID -# $4: permissions (octal) -# $5: source file -# $6: dest file -# -install_initramfs = \ - PACKET=$(strip $(1)); \ - OWN=$(strip $(2)); \ - GRP=$(strip $(3)); \ - PER=$(strip $(4)); \ - SRC=$(strip $(5)); \ - DST=$(strip $(6)); \ - PKG_PKGDIR="$(PKGDIR)/$($(PTX_MAP_TO_PACKAGE_$(notdir $(basename $(basename $@)))))"; \ - \ - if [ "$$SRC" = "-" ]; then \ - SRC=$${PKG_PKGDIR}/$$DST; \ - fi; \ - \ - if [ -z "$(6)" ]; then \ - echo "install_initramfs:"; \ - echo " dir=$$SRC"; \ - echo " owner=$$OWN"; \ - echo " group=$$GRP"; \ - echo " permissions=$$PER"; \ - echo "dir $$SRC $$PER $$OWN $$GRP" >> $(INITRAMFS_CONTROL); \ - else \ - if [ \! -f "$${SRC}" ]; then \ - ptxd_bailout "source '$${SRC}' does not exist!"; \ - fi; \ - echo "install_initramfs:"; \ - echo " installing $$DST from $$SRC"; \ - echo " owner=$$OWN"; \ - echo " group=$$GRP"; \ - echo " permissions=$$PER"; \ - echo "file $$DST $$SRC $$PER $$OWN $$GRP" >> $(INITRAMFS_CONTROL); \ - fi - -# -# install_initramfs_alt -# -# Installs a file with user/group ownership and permissions via -# initramfs. -# -# This macro first looks in $(PTXDIST_WORKSPACE)/initramfs for the file to copy and then -# in $(PTXDIST_TOPDIR)/projectroot/initramfs and installs the file under $(ROOTDIR) -# -# $1: packet label (not used) -# $2: UID -# $3: GID -# $4: permissions (octal) -# $5: source file -# -install_initramfs_alt = \ - PACKET=$(strip $(1)); \ - OWN=$(strip $(2)); \ - GRP=$(strip $(3)); \ - PER=$(strip $(4)); \ - FILE=$(strip $(5)); \ - PKG_PKGDIR="$(PKGDIR)/$($(PTX_MAP_TO_PACKAGE_$(notdir $(basename $(basename $@)))))"; \ - PKG_DIR="$($(PTX_MAP_TO_PACKAGE_$(notdir $(basename $(basename $@))))_DIR)"; \ - \ - if [ -f $(PTXDIST_WORKSPACE)/initramfs$$FILE$(PTXDIST_PLATFORMSUFFIX) ]; then \ - SRC=$(PTXDIST_WORKSPACE)/initramfs$$FILE$(PTXDIST_PLATFORMSUFFIX); \ - elif [ -f $(PTXDIST_WORKSPACE)/initramfs$$FILE ]; then \ - SRC=$(PTXDIST_WORKSPACE)/initramfs$$FILE; \ - elif [ -f $(PTXDIST_TOPDIR)/projectroot/initramfs$$FILE ]; then \ - SRC=$(PTXDIST_TOPDIR)/projectroot/initramfs$$FILE; \ - elif [ -f $${PKG_PKGDIR}$$FILE ]; then \ - SRC=$${PKG_PKGDIR}$$FILE; \ - elif [ -f $${PKG_DIR}$$FILE ]; then \ - SRC=$${PKG_DIR}$$FILE; \ - else \ - echo "initramfs_alt: Search for $$FILE in:"; \ - echo "$(PTXDIST_WORKSPACE)/initramfs$$FILE$(PTXDIST_PLATFORMSUFFIX)"; \ - echo "$(PTXDIST_WORKSPACE)/initramfs$$FILE"; \ - echo "$(PTXDIST_TOPDIR)/projectroot/initramfs$$FILE"; \ - echo "$${PKG_PKGDIR}$$FILE"; \ - echo "$${PKG_DIR}$$FILE"; \ - ptxd_bailout "No suitable file $$FILE found to install"; \ - fi; \ - echo "install_initramfs_alt:"; \ - echo " installing $$FILE from $$SRC"; \ - echo " owner=$$OWN"; \ - echo " group=$$GRP"; \ - echo " permissions=$$PER"; \ - echo "file $$FILE $$SRC $$PER $$OWN $$GRP" >> $(INITRAMFS_CONTROL) - -# -# install_initramfs_link -# -# Installs a soft link in initramfs -# -# $1: packet label (not used) -# $2: source -# $3: destination -# slink <name> <target> <mode> <uid> <gid> -# -install_initramfs_link = \ - PACKET=$(strip $(1)); \ - SRC=$(strip $(2)); \ - DST=$(strip $(3)); \ - echo "install_initramfs_link: src=$$SRC dst=$$DST "; \ - echo "slink $$SRC $$DST 0755 0 0" >> $(INITRAMFS_CONTROL) - -# -# install_initramfs_node -# -# Installs a device node via initramfs -# -# $1: packet label (not used) -# $2: UID -# $3: GID -# $4: permissions (octal) -# $5: type -# $6: major -# $7: minor -# $8: device node name -# -install_initramfs_node = \ - PACKET=$(strip $(1)); \ - OWN=$(strip $(2)); \ - GRP=$(strip $(3)); \ - PER=$(strip $(4)); \ - TYP=$(strip $(5)); \ - MAJ=$(strip $(6)); \ - MIN=$(strip $(7)); \ - DEV=$(strip $(8)); \ - echo "install_initramfs_node:"; \ - echo " owner=$$OWN"; \ - echo " group=$$GRP"; \ - echo " permissions=$$PER"; \ - echo " type=$$TYP"; \ - echo " major=$$MAJ"; \ - echo " minor=$$MIN"; \ - echo " name=$$DEV"; \ - echo "nod $$DEV $$PER $$OWN $$GRP $$TYP $$MAJ $$MIN" >> $(INITRAMFS_CONTROL) - -# vim: syntax=make diff --git a/rules/post/ptxd_make_world_extract.make b/rules/post/ptxd_make_world_extract.make index f58dd6900..98ad26875 100644 --- a/rules/post/ptxd_make_world_extract.make +++ b/rules/post/ptxd_make_world_extract.make @@ -27,17 +27,6 @@ world/patchin/post = \ $(call world/env, $(1)) \ ptxd_make_world_patchin_post -### --- for KLIBC packages only --- - -$(STATEDIR)/klibc-%.extract: - @$(call targetinfo) - @$(call clean, $($(PTX_MAP_TO_PACKAGE_klibc-$(*))_DIR)) - @$(call extract, $(PTX_MAP_TO_PACKAGE_klibc-$(*)), $(KLIBC_BUILDDIR)) - @$(call patchin, $(PTX_MAP_TO_PACKAGE_klibc-$(*)), $($(PTX_MAP_TO_PACKAGE_klibc-$(*))_DIR)) - @$(call touch) - -### --- all but KLIBC packages --- - $(STATEDIR)/%.extract: @$(call targetinfo) @$(call clean, $($(PTX_MAP_TO_PACKAGE_$(*))_DIR)) diff --git a/rules/pre/klibc.make b/rules/pre/klibc.make deleted file mode 100644 index 78645646b..000000000 --- a/rules/pre/klibc.make +++ /dev/null @@ -1,52 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Jon Ringle <jon@ringle.org> -# -# 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. -# - -# -# This file contains global macro and environment definitions for klibc -# - -# ---------------------------------------------------------------------------- -# KLIBC stuff -# ---------------------------------------------------------------------------- - -KLIBC_PATH := $(CROSS_PATH) - -KLIBC_CFLAGS := -I$(PTXDIST_SYSROOT_TARGET)/usr/lib/klibc/include -KLIBC_LDFLAGS := -L$(PTXDIST_SYSROOT_TARGET)/usr/lib/klibc/lib -KLIBC_ENV_CFLAGS := CFLAGS="$(KLIBC_CFLAGS)" -KLIBC_ENV_LDFLAGS := LDFLAGS="$(KLIBC_LDFLAGS)" - -KLIBC_ENV_CC := CC=klcc -KLIBC_ENV_LD := LD=klcc - - -KLIBC_ENV_PROGS := \ - $(KLIBC_ENV_CC) \ - $(KLIBC_ENV_LD) - -KLIBC_ARCH_ENV := KLIBCARCH=$(PTXCONF_ARCH_STRING) - -KLIBC_ENV := \ - $(CROSS_ENV_PROGS) \ - $(KLIBC_ENV_PROGS) \ - $(KLIBC_ARCH_ENV) \ - $(KLIBC_ENV_CFLAGS) \ - $(KLIBC_ENV_LDFLAGS) - -KLIBC_AUTOCONF_SYSROOT_ROOT := \ - --prefix= - -KLIBC_AUTOCONF_ARCH := $(CROSS_AUTOCONF_ARCH) - -KLIBC_AUTOCONF := $(KLIBC_AUTOCONF_SYSROOT_ROOT) $(KLIBC_AUTOCONF_ARCH) - -INITRAMFS_CONTROL := $(STATEDIR)/initramfs_spec - -# vim: syntax=make diff --git a/rules/templates/template-klibc-existing-target-in b/rules/templates/template-klibc-existing-target-in deleted file mode 100644 index ec66826ae..000000000 --- a/rules/templates/template-klibc-existing-target-in +++ /dev/null @@ -1,8 +0,0 @@ -## SECTION=initramfs - -config @CLASS@@PACKAGE@ - bool - prompt "@class@@package@" - select KLIBC - help - FIXME diff --git a/rules/templates/template-klibc-existing-target-make b/rules/templates/template-klibc-existing-target-make deleted file mode 100644 index 44f76eeff..000000000 --- a/rules/templates/template-klibc-existing-target-make +++ /dev/null @@ -1,93 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) @YEAR@ by @AUTHOR@ -# -# 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_@CLASS@@PACKAGE@) += @class@@package@ - -# -# Paths and names -# -@CLASS@@PACKAGE@ = @class@$(@PACKAGE@) -@CLASS@@PACKAGE@_SOURCE = $(@PACKAGE@_SOURCE) -@CLASS@@PACKAGE@_DIR = $(@CLASS@BUILDDIR)/$(@PACKAGE@) - -ifdef PTXCONF_@CLASS@@PACKAGE@ -$(STATEDIR)/klibc.targetinstall.post: $(STATEDIR)/@class@@package@.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@class@@package@.extract: -# @$(call targetinfo) -# @$(call clean, $(@CLASS@@PACKAGE@_DIR)) -# @$(call extract, @PACKAGE@, $(@CLASS@BUILDDIR)) -# @$(call patchin, @CLASS@@PACKAGE@, $(@CLASS@@PACKAGE@_DIR)) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -#@CLASS@@PACKAGE@_CONF_ENV := $(@CLASS@ENV) - -# -# autoconf -# -@CLASS@@PACKAGE@_CONF_TOOL := autoconf -#@CLASS@@PACKAGE@_CONF_OPT := $(@AUTOCONF_CLASS@AUTOCONF) - -#$(STATEDIR)/@class@@package@.prepare: -# @$(call targetinfo) -# @$(call clean, $(@CLASS@@PACKAGE@_DIR)/config.cache) -# cd $(@CLASS@@PACKAGE@_DIR) && \ -# $(@CLASS@@PACKAGE@_PATH) $(@CLASS@@PACKAGE@_ENV) \ -# ./configure $(@CLASS@@PACKAGE@_CONF_OPT) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@class@@package@.compile: -# @$(call targetinfo) -# @$(call world/compile, @CLASS@@PACKAGE@) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@class@@package@.install: -# @$(call targetinfo) -# @$(call world/install, @CLASS@@PACKAGE@) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/@class@@package@.targetinstall: - @$(call targetinfo) - @$(call install_initramfs, @class@@package@, 0, 0, 0755, $(@CLASS@@PACKAGE@_DIR)/foobar, /foobar); - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@class@@package@.clean: -# @$(call targetinfo) -# @$(call clean_pkg, @CLASS@@PACKAGE@) - -# vim: syntax=make diff --git a/rules/templates/template-klibc-in b/rules/templates/template-klibc-in deleted file mode 100644 index 69fe0b8f7..000000000 --- a/rules/templates/template-klibc-in +++ /dev/null @@ -1,8 +0,0 @@ -## SECTION=initramfs - -config @PACKAGE@ - bool - prompt "@package@" - select KLIBC - help - FIXME diff --git a/rules/templates/template-klibc-make b/rules/templates/template-klibc-make deleted file mode 100644 index c2df39e7b..000000000 --- a/rules/templates/template-klibc-make +++ /dev/null @@ -1,94 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) @YEAR@ by @AUTHOR@ -# -# 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_@PACKAGE@) += @package@ - -# -# Paths and names -# -@PACKAGE@_VERSION := @VERSION@ -@PACKAGE@_MD5 := -@PACKAGE@ := @package_filename@-$(@PACKAGE@_VERSION) -@PACKAGE@_SUFFIX := @SUFFIX@ -@PACKAGE@_URL := @URL@/$(@PACKAGE@).$(@PACKAGE@_SUFFIX) -@PACKAGE@_SOURCE := $(SRCDIR)/$(@PACKAGE@).$(@PACKAGE@_SUFFIX) -@PACKAGE@_DIR := $(KLIBC_BUILDDIR)/$(@PACKAGE@) - -ifdef PTXCONF_@PACKAGE@ -$(STATEDIR)/klibc.targetinstall.post: $(STATEDIR)/@package@.targetinstall -endif - -# ---------------------------------------------------------------------------- -# Get -# ---------------------------------------------------------------------------- - -#$(@PACKAGE@_SOURCE): -# @$(call targetinfo) -# @$(call get, @PACKAGE@) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -@PACKAGE@_CONF_ENV := $(KLIBC_ENV) - -# -# autoconf -# -@PACKAGE@_CONF_TOOL := autoconf -@PACKAGE@_CONF_OPT := $(KLIBC_AUTOCONF) - -#$(STATEDIR)/@package@.prepare: -# @$(call targetinfo) -# @$(call clean, $(@PACKAGE@_DIR)/config.cache) -# cd $(@PACKAGE@_DIR) && \ -# $(@PACKAGE@_PATH) $(@PACKAGE@_ENV) \ -# ./configure $(@PACKAGE@_CONF_OPT) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@package@.compile: -# @$(call targetinfo) -# @$(call world/compile, @PACKAGE@) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@package@.install: -# @$(call targetinfo) -# @$(call world/install, @PACKAGE@) -# @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/@package@.targetinstall: - @$(call targetinfo) - @$(call install_initramfs, @package@, 0, 0, 0755, $(@PACKAGE@_DIR)/foobar, /foobar); - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -#$(STATEDIR)/@package@.clean: -# @$(call targetinfo) -# @$(call clean_pkg, @PACKAGE@) - -# vim: syntax=make diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index 68c614218..fe18aa6d5 100644 --- a/scripts/lib/ptxd_lib_template.sh +++ b/scripts/lib/ptxd_lib_template.sh @@ -299,16 +299,6 @@ export -f ptxd_template_new_cross ptxd_template_help_list[${#ptxd_template_help_list[@]}]="cross" ptxd_template_help_list[${#ptxd_template_help_list[@]}]="create cross development package" -ptxd_template_new_klibc() { - ptxd_template_setup_class KLIBC_ && - ptxd_template_read_remote_existing && - ptxd_template_write_rules -} -export -f ptxd_template_new_klibc -ptxd_template_help_list[${#ptxd_template_help_list[@]}]="klibc" -ptxd_template_help_list[${#ptxd_template_help_list[@]}]="create package for initramfs built against klibc" -ptxd_template_help_list[${#ptxd_template_help_list[@]}]="" - ptxd_template_new_src_autoconf_lib() { ptxd_template_autoconf_base } diff --git a/scripts/lib/ptxd_make_world_common.sh b/scripts/lib/ptxd_make_world_common.sh index c8fc03282..f04d2ed05 100644 --- a/scripts/lib/ptxd_make_world_common.sh +++ b/scripts/lib/ptxd_make_world_common.sh @@ -150,7 +150,6 @@ ptxd_make_world_init_compat() { # pkg_sysroot_dir # case "${pkg_stamp}" in - klibc-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}/usr/lib/klibc" ;; host-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_HOST}" ;; cross-*) pkg_sysroot_dir="${PTXDIST_SYSROOT_CROSS}" ;; *) pkg_sysroot_dir="${PTXDIST_SYSROOT_TARGET}" ;; diff --git a/scripts/ptxdist_vars.sh b/scripts/ptxdist_vars.sh index 5a7dfdd22..1a555d2e7 100644 --- a/scripts/ptxdist_vars.sh +++ b/scripts/ptxdist_vars.sh @@ -6,7 +6,6 @@ PTX_MIGRATEDIR=${SCRIPTSDIR}/migrate # created dirs during build BUILDDIR=${PTXDIST_PLATFORMDIR}/build-target -KLIBC_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-klibc-target CROSS_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-cross HOST_BUILDDIR=${PTXDIST_PLATFORMDIR}/build-host PKGDIR=${PTXDIST_PLATFORMDIR}/packages |