diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-24 19:49:20 +0000 |
---|---|---|
committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-24 19:49:20 +0000 |
commit | 3e3cc9f9d72c05406f2937dc57eb98c02bceee24 (patch) | |
tree | a9556baa18ba096715bc0a1f58a28cad92b5eaf7 | |
parent | e3c29bf1b010c2e097e9655151a7a6ff11a16e75 (diff) | |
download | ptxdist-3e3cc9f9d72c05406f2937dc57eb98c02bceee24.tar.gz ptxdist-3e3cc9f9d72c05406f2937dc57eb98c02bceee24.tar.xz |
ipkgisation finished
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2507 33e552b5-05e3-0310-8538-816dae2090ed
45 files changed, 844 insertions, 733 deletions
diff --git a/COMPILE-TEST b/COMPILE-TEST index 606ee562b..ed100c412 100644 --- a/COMPILE-TEST +++ b/COMPILE-TEST @@ -1,80 +1,20 @@ Automatic Compilation Test -------------------------- -start: So Mär 20 17:49:15 CET 2005 +start: Fr Apr 22 12:09:21 CEST 2005 config...: abbcc-viac3 -date.....: So Mär 20 17:49:15 CET 2005 -user.....: robert@himalia -buildtime: 0h10m28s -result...: 0 +date.....: Fr Apr 22 12:09:21 CEST 2005 +user.....: rsc@europa +buildtime: 0h0m2s +result...: 2 config...: i586-generic-glibc -date.....: So Mär 20 17:59:49 CET 2005 -user.....: robert@himalia -buildtime: 0h6m27s -result...: 0 +date.....: Fr Apr 22 12:09:30 CEST 2005 +user.....: rsc@europa +buildtime: 0h0m2s +result...: 2 config...: frako -date.....: So Mär 20 18:06:21 CET 2005 -user.....: robert@himalia -buildtime: 0h12m38s -result...: 0 - -config...: visbox -date.....: So Mär 20 18:19:05 CET 2005 -user.....: robert@himalia -buildtime: 0h14m37s -result...: 0 - -config...: rayonic-i586 -date.....: So Mär 20 18:33:47 CET 2005 -user.....: robert@himalia -buildtime: 0h11m3s -result...: 0 - -config...: innokom-2.4-2.95 -date.....: So Mär 20 18:44:55 CET 2005 -user.....: robert@himalia -buildtime: 0h6m2s -result...: 0 - -config...: innokom-2.4-3.3.3 -date.....: So Mär 20 18:51:02 CET 2005 -user.....: robert@himalia -buildtime: 0h7m17s -result...: 0 - -config...: mx1fs2 -date.....: So Mär 20 18:58:24 CET 2005 -user.....: robert@himalia -buildtime: 0h5m2s -result...: 0 - -config...: pii_nge -date.....: So Mär 20 19:03:31 CET 2005 -user.....: robert@himalia -buildtime: 0h19m19s -result...: 0 - -config...: ssv_pnp2110_eva1 -date.....: So Mär 20 19:23:04 CET 2005 -user.....: robert@himalia -buildtime: 0h19m17s -result...: 0 - -config...: eb8245 -date.....: So Mär 20 19:42:35 CET 2005 -user.....: robert@himalia -buildtime: 0h1m52s -result...: 0 - -config...: cameron-efco -date.....: So Mär 20 19:44:30 CET 2005 -user.....: robert@himalia -buildtime: 0h14m21s -result...: 0 - - -stop: So Mär 20 19:58:56 CET 2005 - +date.....: Fr Apr 22 12:09:39 CEST 2005 +user.....: rsc@europa @@ -1,6 +1,13 @@ +2005-04-24 Robert Schwebel <r.schwebel@pengutronix.de> + + * ipkg: converted rest of the packets which already used + copy_root & friends. + * glibc: ipkgized; converted macros for toolchain copy + * proftpd: moved config from rootfs to proftpd packet + 2005-04-18 Robert Schwebel <r.schwebel@pengutronix.de> - * ipkt: adding PTXCONF_IMAGE_IPKG_EXTRA_ARGS; Now one can tell + * ipkg: adding PTXCONF_IMAGE_IPKG_EXTRA_ARGS; Now one can tell ipkg-build to use tar instead of ar and more. Patch by Steven Scholz * sqlite: ipkgized; patch by Ladislav Michl diff --git a/rules/Rules.make b/rules/Rules.make index 57f1934cf..4b02c027b 100644 --- a/rules/Rules.make +++ b/rules/Rules.make @@ -915,14 +915,18 @@ feature_patchin = \ # $6: strip (for files; y|n); default is to strip # install_copy = \ - @OWN=`echo $(1) | sed -e 's/[[:space:]]//g'`; \ + OWN=`echo $(1) | sed -e 's/[[:space:]]//g'`; \ GRP=`echo $(2) | sed -e 's/[[:space:]]//g'`; \ PER=`echo $(3) | sed -e 's/[[:space:]]//g'`; \ SRC=`echo $(4) | sed -e 's/[[:space:]]//g'`; \ DST=`echo $(5) | sed -e 's/[[:space:]]//g'`; \ STRIP="$(strip $(6))"; \ if [ -z "$(5)" ]; then \ - echo "install_copy: dir=$$SRC owner=$$OWN group=$$GRP permissions=$$PER"; \ + echo "install_copy:"; \ + echo " dir=$$SRC"; \ + echo " owner=$$OWN"; \ + echo " group=$$GRP"; \ + echo " permissions=$$PER"; \ if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ $(INSTALL) -d $(IMAGEDIR)/ipkg/$$SRC; \ if [ $$? -ne 0 ]; then \ @@ -937,7 +941,12 @@ install_copy = \ fi; \ echo "f:$$SRC:$$OWN:$$GRP:$$PER" >> $(TOPDIR)/permissions; \ else \ - echo "install_copy src=$$SRC dst=$$DST owner=$$OWN group=$$GRP permissions=$$PER"; \ + echo "install_copy:"; \ + echo " src=$$SRC"; \ + echo " dst=$$DST"; \ + echo " owner=$$OWN"; \ + echo " group=$$GRP"; \ + echo " permissions=$$PER"; \ if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ rm -fr $(IMAGEDIR)/ipkg/$$DST; \ $(INSTALL) -D $$SRC $(IMAGEDIR)/ipkg/$$DST; \ @@ -965,6 +974,129 @@ install_copy = \ fi # +# install_copy_toolchain_lib +# +# $1: source +# $2: destination +# $2: strip (y|n) default is to strip +# +install_copy_toolchain_lib = \ + LIB="$(strip $1)"; \ + DST="$(strip $2)"; \ + STRIP="$(strip $3)"; \ + \ + LIB_DIR=`$(CROSS_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ + \ + if test \! -d "$${LIB_DIR}"; then \ + echo "copy_toolchain_lib_root: lib=$${LIB} not found"; \ + exit -1; \ + fi; \ + \ + LIB="$(strip $1)"; \ + for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ + LIB=`basename $${FILE}`; \ + while test -n "$${LIB}"; do \ + echo "copy_toolchain_lib_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ + mkdir -p $(ROOTDIR)$${DST}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + mkdir -p $(IMAGEDIR)/ipkg/$${DST}; \ + fi; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + cp -d $${LIB_DIR}/$${LIB} $(IMAGEDIR)/ipkg/$${DST}/; \ + fi; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(IMAGEDIR)/ipkg/$${DST}/$${LIB};\ + fi; \ + case "$${STRIP}" in \ + 0 | n | no) \ + ;; \ + *) \ + $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + $(CROSS_STRIP) $(IMAGEDIR)/ipkg/$${DST}/$${LIB};\ + fi; \ + ;; \ + esac; \ + echo "f:$${DST}/$${LIB}:0:0:755" >> $(TOPDIR)/permissions; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ + done; \ + \ + echo -n + +# +# install_copy_toolchain_dl +# +# $1: destination +# $2: strip (y|n) default is to strip +# +install_copy_toolchain_dl = \ + DST="$(strip $1)"; \ + STRIP="$(strip $2)"; \ + \ + LIB="`echo 'int main(void){return 0;}' | \ + $(CROSS_CC) -x c -o /dev/null -v - 2>&1 | \ + grep dynamic-linker | \ + perl -n -p -e 's/.* -dynamic-linker ([^ ]*).*/\1/'`"; \ + \ + LIB="`basename $${LIB}`"; \ + \ + LIB_DIR=`$(CROSS_CC) -print-file-name=$${LIB} | sed -e "s,/$${LIB}\$$,,"`; \ + \ + if test \! -d "$${LIB_DIR}"; then \ + echo "copy_toolchain_ld_root: lib=$${LIB} not found"; \ + exit -1; \ + fi; \ + \ + for FILE in `find $${LIB_DIR} -maxdepth 1 -type l -name "$${LIB}*"`; do \ + LIB=`basename $${FILE}`; \ + while test -n "$${LIB}"; do \ + echo "copy_toolchain_ld_root lib=$${LIB} dst=$${DST}"; \ + rm -fr $(ROOTDIR)$${DST}/$${LIB}; \ + mkdir -p $(ROOTDIR)$${DST}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + rm -fr $(IMAGEDIR)/ipkg/$${DST}/$${LIB}; \ + mkdir -p $(IMAGEDIR)/ipkg/$${DST}; \ + fi; \ + if test -h $${LIB_DIR}/$${LIB}; then \ + cp -d $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + cp -d $${LIB_DIR}/$${LIB} $(IMAGEDIR)/ipkg/$${DST}/; \ + fi; \ + elif test -f $${LIB_DIR}/$${LIB}; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(ROOTDIR)$${DST}/$${LIB}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + $(INSTALL) -D $${LIB_DIR}/$${LIB} $(IMAGEDIR)/ipkg/$${DST}/$${LIB};\ + fi; \ + case "$${STRIP}" in \ + 0 | n | no) \ + ;; \ + *) \ + $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + $(CROSS_STRIP) $(ROOTDIR)$${DST}/$${LIB}; \ + fi; \ + ;; \ + esac; \ + echo "f:$${DST}/$${LIB}:0:0:755" >> $(TOPDIR)/permissions; \ + else \ + exit -1; \ + fi; \ + LIB="`readlink $${LIB_DIR}/$${LIB}`"; \ + done; \ + done; \ + \ + echo -n + +# # install_link # # Installs a soft link in root directory in an ipkg packet. @@ -973,12 +1105,14 @@ install_copy = \ # $2: destination # install_link = \ - @SRC=$(strip $(1)); \ + SRC=$(strip $(1)); \ DST=$(strip $(2)); \ rm -fr $(ROOTDIR)$$DST; \ echo "install_link: src=$$SRC dst=$$DST "; \ - $(LN) -sf $$SRC $(ROOTDIR)$$DST; \ + mkdir -p `dirname $(ROOTDIR)$$DST`; \ + $(LN) -sf $$SRC $(ROOTDIR)$$DST; \ if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + mkdir -p `dirname $(IMAGEDIR)/ipkg$$DST`; \ $(LN) -sf $$SRC $(IMAGEDIR)/ipkg/$$DST; \ fi @@ -991,7 +1125,7 @@ install_link = \ # $2: replacement # install_fixup = \ - @if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ REPLACE_FROM=$(strip $(1)); \ REPLACE_TO=$(strip $(2)); \ echo -n "install_fixup: @$$REPLACE_FROM@ -> $$REPLACE_TO ... "; \ @@ -1005,7 +1139,7 @@ install_fixup = \ # Deletes $(IMAGEDIR)/ipkg and prepares for new ipkg package creation # install_init = \ - @if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ PACKET=$(strip $(1)); \ echo -n "install_init: preparing for image creation..."; \ rm -fr $(IMAGEDIR)/ipkg; \ @@ -1021,7 +1155,7 @@ install_init = \ # Finishes ipkg packet creation # install_finish = \ - @if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ echo -n "install_finish: writing ipkg packet ... "; \ (echo "pushd $(IMAGEDIR)/ipkg;"; $(AWK) -F: $(DOPERMISSIONS) $(TOPDIR)/permissions; echo "popd;"; \ echo "$(PTXCONF_PREFIX)/bin/ipkg-build $(PTXCONF_IMAGE_IPKG_EXTRA_ARGS) $(IMAGEDIR)/ipkg $(IMAGEDIR)") |\ diff --git a/rules/bing.make b/rules/bing.make index 8ba3e314e..bf641dd81 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -115,18 +115,16 @@ bing_targetinstall_deps = $(STATEDIR)/bing.compile $(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps) @$(call targetinfo, $@) - install -d $(ROOTDIR)/usr/sbin - - $(call install_init,default) - $(call install_fixup,PACKAGE,bing) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(BING_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0755, $(BING_DIR)/bing, /usr/sbin/bing) - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,bing) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(BING_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + @$(call install_copy, 0, 0, 0755, $(BING_DIR)/bing, /usr/sbin/bing) + @$(call install_finish) touch $@ diff --git a/rules/bonniexx.make b/rules/bonniexx.make index b4825686a..8d59b1f73 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -125,18 +125,18 @@ bonniexx_targetinstall_deps = $(STATEDIR)/bonniexx.compile $(STATEDIR)/bonniexx.targetinstall: $(bonniexx_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,bonniexx) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(COREUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,bonniexx) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(COREUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0644, $(BONNIEXX_DIR)/bonnie++, /usr/bin/bonnie++) + @$(call install_copy, 0, 0, 0644, $(BONNIEXX_DIR)/bonnie++, /usr/bin/bonnie++) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/busybox.make b/rules/busybox.make index 3377ebd34..ac37fe4a8 100644 --- a/rules/busybox.make +++ b/rules/busybox.make @@ -79,8 +79,8 @@ BUSYBOX_MAKEVARS += LDFLAGS='$(call remove_quotes,$(TARGET_LDFLAGS))' # dependencies # busybox_prepare_deps = $(STATEDIR)/virtual-xchain.install -busybox_prepare_deps += $(STATEDIR)/busybox.extract busybox_prepare_deps += $(STATEDIR)/virtual-libc.install +busybox_prepare_deps += $(STATEDIR)/busybox.extract $(STATEDIR)/busybox.prepare: $(busybox_prepare_deps) @$(call targetinfo, $@) @@ -133,13 +133,27 @@ busybox_targetinstall_deps += $(STATEDIR)/virtual-libc.targetinstall $(STATEDIR)/busybox.targetinstall: $(busybox_targetinstall_deps) @$(call targetinfo, $@) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,busybox) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(BUSYBOX_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + rm -f $(BUSYBOX_DIR)/busybox.links - install -d $(ROOTDIR) + cd $(BUSYBOX_DIR) && $(MAKE) busybox.links + + @$(call install_copy, 0, 0, 1555, $(BUSYBOX_DIR)/busybox, /bin/busybox) + for file in `cat $(BUSYBOX_DIR)/busybox.links`; do \ + $(call install_link, /bin/busybox, $$file); \ + done - cd $(BUSYBOX_DIR) && \ - $(BUSYBOX_PATH) $(MAKE) install \ - PREFIX=$(ROOTDIR) $(BUSYBOX_MAKEVARS) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/bin/busybox + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script, n) + + @$(call install_finish) + touch $@ # ---------------------------------------------------------------------------- diff --git a/rules/canconfig.make b/rules/canconfig.make index 34d093910..9f64bc9a5 100644 --- a/rules/canconfig.make +++ b/rules/canconfig.make @@ -114,18 +114,18 @@ canconfig_targetinstall_deps = $(STATEDIR)/canconfig.compile $(STATEDIR)/canconfig.targetinstall: $(canconfig_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,canconfig) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(CANCONFIG_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(CANCONFIG_DIR)/canconfig, /usr/sbin/canconfig) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,canconfig) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(CANCONFIG_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(CANCONFIG_DIR)/canconfig, /usr/sbin/canconfig) + + @$(call install_finish) touch $@ diff --git a/rules/coreutils.make b/rules/coreutils.make index aa4f6aaa0..529ccfc4a 100644 --- a/rules/coreutils.make +++ b/rules/coreutils.make @@ -125,32 +125,30 @@ coreutils_targetinstall: $(STATEDIR)/coreutils.targetinstall $(STATEDIR)/coreutils.targetinstall: $(STATEDIR)/coreutils.compile @$(call targetinfo, $@) - install -d $(ROOTDIR)/usr/bin - install -d $(ROOTDIR)/bin - - $(call install_init,default) - $(call install_fixup,PACKAGE,coreutils) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(COREUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + + @$(call install_init,default) + @$(call install_fixup,PACKAGE,coreutils) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(COREUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_COREUTILS_CP - $(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/cp, /bin/cp) + @$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/cp, /bin/cp) endif ifdef PTXCONF_COREUTILS_DD - $(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/dd, /bin/dd) + @$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/dd, /bin/dd) endif ifdef PTXCONF_COREUTILS_MD5SUM - $(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/md5sum, /bin/md5sum) + @$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/md5sum, /bin/md5sum) endif ifdef PTXCONF_COREUTILS_SEQ - $(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/seq, /usr/bin/seq) + @$(call install_copy, 0, 0, 0755, $(COREUTILS_DIR)/src/seq, /usr/bin/seq) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 9b169beef..befcd41bb 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -123,25 +123,23 @@ e2fsprogs_targetinstall: $(STATEDIR)/e2fsprogs.targetinstall $(STATEDIR)/e2fsprogs.targetinstall: $(STATEDIR)/e2fsprogs.compile @$(call targetinfo, $@) - mkdir -p $(ROOTDIR)/sbin - - $(call install_init,default) - $(call install_fixup,PACKAGE,e2fsprogs) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(E2FSPROGS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,e2fsprogs) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(E2FSPROGS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_E2FSPROGS_MKFS - $(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/mke2fs, /sbin/mke2fs) + @$(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/misc/mke2fs, /sbin/mke2fs) endif ifdef PTXCONF_E2FSPROGS_E2FSCK - $(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/e2fsck/e2fsck.shared, /sbin/e2fsck) + @$(call install_copy, 0, 0, 0755, $(E2FSPROGS_BUILD_DIR)/e2fsck/e2fsck.shared, /sbin/e2fsck) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/efax.make b/rules/efax.make index 55ee60280..79e9a0f1d 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -121,19 +121,19 @@ efax_targetinstall_deps = $(STATEDIR)/efax.compile $(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,efax) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(EFAX_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,efax) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(EFAX_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efax, /usr/bin/efax) - $(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efix, /usr/bin/efix) + @$(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efax, /usr/bin/efax) + @$(call install_copy, 0, 0, 0755, $(EFAX_DIR)/efix, /usr/bin/efix) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/expat.make b/rules/expat.make index 7b8b04a0c..9ee0bfb8c 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -124,20 +124,20 @@ expat_targetinstall_deps = $(STATEDIR)/expat.compile $(STATEDIR)/expat.targetinstall: $(expat_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,expat) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(EXPAT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(EXPAT_DIR)/.libs/libexpat.so.0.5.0, /lib/libexpat.so.0.5.0) - $(call link_root, /lib/libexpat.so.0.5.0, /lib/libexpat.so.0) - $(call link_root, /lib/libexpat.so.0.5.0, /lib/libexpat.so) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,expat) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(EXPAT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(EXPAT_DIR)/.libs/libexpat.so.0.5.0, /lib/libexpat.so.0.5.0) + @$(call install_link, /lib/libexpat.so.0.5.0, /lib/libexpat.so.0) + @$(call install_link, /lib/libexpat.so.0.5.0, /lib/libexpat.so) + + @$(call install_finish) touch $@ diff --git a/rules/fbtest.make b/rules/fbtest.make index fb9601b0b..75c0d851c 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -114,18 +114,18 @@ fbtest_targetinstall_deps = $(STATEDIR)/fbtest.compile $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,fbtest) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(FBTEST_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,fbtest) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(FBTEST_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0755, $(FBTEST_DIR)/$(PTXCONF_COMPILER_PREFIX)fbtest, /sbin/fbtest) + @$(call install_copy, 0, 0, 0755, $(FBTEST_DIR)/$(PTXCONF_COMPILER_PREFIX)fbtest, /sbin/fbtest) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/fbutils.make b/rules/fbutils.make index 49be75988..58e3c972d 100644 --- a/rules/fbutils.make +++ b/rules/fbutils.make @@ -115,31 +115,31 @@ fbutils_targetinstall_deps = $(STATEDIR)/fbutils.compile $(STATEDIR)/fbutils.targetinstall: $(fbutils_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,fbutils) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(FBUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,fbutils) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(FBUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_FBUTILS_FBSET - $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset) + @$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset) endif ifdef PTXCONF_FBUTILS_FBCMAP - $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap) + @$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap) endif ifdef PTXCONF_FBUTILS_FBCONVERT - $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) + @$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) endif ifdef PTXCONF_FBUTILS_FBCONVERT - $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) + @$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) endif ifdef PTXCONF_FBUTILS_CON2FBMAP - $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap) + @$(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/figlet.make b/rules/figlet.make index a4f78e462..d19b8d809 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -115,23 +115,21 @@ figlet_targetinstall_deps = $(STATEDIR)/figlet.compile $(STATEDIR)/figlet.targetinstall: $(figlet_targetinstall_deps) @$(call targetinfo, $@) - install -d $(ROOTDIR)/usr/sbin - install -d $(ROOTDIR)/usr/share/figlet rm -f $(ROOTDIR)/usr/sbin/figlet $(ROOTDIR)/usr/share/figlet/* - $(call install_init,default) - $(call install_fixup,PACKAGE,figlet) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(FIGLET_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,figlet) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(FIGLET_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0755, $(FIGLET_DIR)/figlet, /usr/sbin/figlet) - $(call install_copy, 0, 0, 0644, $(FIGLET_DIR)/fonts/standard.flf, /usr/share/figlet/standard.flf) + @$(call install_copy, 0, 0, 0755, $(FIGLET_DIR)/figlet, /usr/sbin/figlet) + @$(call install_copy, 0, 0, 0644, $(FIGLET_DIR)/fonts/standard.flf, /usr/share/figlet/standard.flf, n) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/gdb.make b/rules/gdb.make index 6b480c2ff..375098c51 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -151,18 +151,18 @@ $(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps) mkdir -p $(ROOTDIR)/usr/bin - $(call install_init,default) - $(call install_fixup,PACKAGE,gdb) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(GDB_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(GDB_BUILDDIR)/gdb/gdb, /usr/bin/gdb) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,gdb) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(GDB_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(GDB_BUILDDIR)/gdb/gdb, /usr/bin/gdb) + + @$(call install_finish) $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/gdb touch $@ diff --git a/rules/gdbserver.make b/rules/gdbserver.make index 48afddb2c..753d18fb4 100644 --- a/rules/gdbserver.make +++ b/rules/gdbserver.make @@ -102,20 +102,18 @@ gdbserver_targetinstall: $(STATEDIR)/gdbserver.targetinstall $(STATEDIR)/gdbserver.targetinstall: $(STATEDIR)/gdbserver.compile @$(call targetinfo, $@) - mkdir -p $(ROOTDIR)/usr/bin - - $(call install_init,default) - $(call install_fixup,PACKAGE,gdbserver) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(GDB_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(GDBSERVER_BUILDDIR)/gdbserver, /usr/bin/gdbserver) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,gdbserver) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(GDB_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(GDBSERVER_BUILDDIR)/gdbserver, /usr/bin/gdbserver) + + @$(call install_finish) touch $@ diff --git a/rules/glib26.make b/rules/glib26.make index 89113c01a..e481bc39f 100644 --- a/rules/glib26.make +++ b/rules/glib26.make @@ -134,32 +134,32 @@ glib26_targetinstall_deps = $(STATEDIR)/glib26.compile $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,glib26) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(GLIB26_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0.600.1) - $(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0) - $(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,glib26) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(GLIB26_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0.600.1) + @$(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0) + @$(call install_link, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so) - $(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0.600.1) - $(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0) - $(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so) + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0.600.1) + @$(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0) + @$(call install_link, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so) - $(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0.600.1) - $(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0) - $(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so) + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0.600.1) + @$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0) + @$(call install_link, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so) - $(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0.600.1) - $(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0) - $(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so) + @$(call install_copy, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0.600.1) + @$(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0) + @$(call install_link, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/glibc.make b/rules/glibc.make index f800c60a1..41b7bc82f 100644 --- a/rules/glibc.make +++ b/rules/glibc.make @@ -97,91 +97,106 @@ endif $(STATEDIR)/glibc.targetinstall: $(glibc_targetinstall_deps) @$(call targetinfo, $@) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,glibc) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(GLIBC_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + ifdef PTXCONF_GLIBC_INSTALL - @$(call copy_toolchain_dl_root, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_dl, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_LIBC - @$(call copy_toolchain_lib_root, libc.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libc.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_PTHREAD - @$(call copy_toolchain_lib_root, libpthread.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libpthread.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_THREAD_DB - @$(call copy_toolchain_lib_root, libthread_db.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libthread_db.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_LIBRT - @$(call copy_toolchain_lib_root, librt.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, librt.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_DL - @$(call copy_toolchain_lib_root, libdl.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libdl.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_CRYPT - @$(call copy_toolchain_lib_root, libcrypt.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libcrypt.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_UTIL - @$(call copy_toolchain_lib_root, libutil.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libutil.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_LIBM - @$(call copy_toolchain_lib_root, libm.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libm.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_DNS - @$(call copy_toolchain_lib_root, libnss_dns.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_dns.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_FILES - @$(call copy_toolchain_lib_root, libnss_files.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_files.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_HESIOD - @$(call copy_toolchain_lib_root, libnss_hesiod.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_hesiod.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_NIS - @$(call copy_toolchain_lib_root, libnss_nis.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_nis.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_NISPLUS - @$(call copy_toolchain_lib_root, libnss_nisplus.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_nisplus.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSS_COMPAT - @$(call copy_toolchain_lib_root, libnss_compat.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnss_compat.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_RESOLV - @$(call copy_toolchain_lib_root, libresolv.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libresolv.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_NSL - @$(call copy_toolchain_lib_root, libnsl.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, libnsl.so, /lib, $(GLIBC_STRIP)) endif ifdef PTXCONF_GLIBC_GCONV - install -d $(ROOTDIR)/usr/lib/gconv + @$(call install_copy, 0, 0, 0755, /usr/lib/gconf) rm -f $(ROOTDIR)/usr/lib/gconv/gconv-modules endif ifdef PTXCONF_GLIBC_GCONV_ISO8859_1 - @$(call copy_toolchain_lib_root, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP)) + @$(call install_copy_toolchain_lib, gconv/ISO8859-1.so, /lib, $(GLIBC_STRIP)) echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \ >> $(ROOTDIR)/usr/lib/gconv/gconv-modules + if [ "$(PTXCONF_IMAGE_IPKG)" != "" ]; then \ + echo "module INTERNAL ISO-8859-1// ISO8859-1 1" \ + >> $(ROOTDIR)/usr/lib/gconv/gconv-modules; \ + fi endif # Zonefiles - $(call copy_root, 0, 0, 0755, /usr/share/zoneinfo) - for target in $(GLIBC_ZONEFILES-y); do \ - cp -a $(GLIBC_ZONEDIR)/zoneinfo/$$target $(ROOTDIR)/usr/share/zoneinfo/; \ + @$(call install_copy, 0, 0, 0755, /usr/share/zoneinfo) + for target in $(GLIBC_ZONEFILES-y); do \ + $(call install_copy, 0, 0, 0644, $(GLIBC_ZONEDIR)/zoneinfo/$$target, /usr/share/zoneinfo/$$target) \ done; + @$(call install_finish) + touch $@ # ---------------------------------------------------------------------------- diff --git a/rules/hexedit.make b/rules/hexedit.make index 5c82248d0..47165ade0 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -126,20 +126,18 @@ hexedit_targetinstall_deps = $(STATEDIR)/hexedit.compile $(STATEDIR)/hexedit.targetinstall: $(hexedit_targetinstall_deps) @$(call targetinfo, $@) - install -d $(ROOTDIR)/usr/bin - - $(call install_init,default) - $(call install_fixup,PACKAGE,hexedit) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(HEXEDIT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit, /usr/bin/hexedit) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,hexedit) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(HEXEDIT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(HEXEDIT_DIR)/hexedit, /usr/bin/hexedit) + + @$(call install_finish) touch $@ diff --git a/rules/hotplug.make b/rules/hotplug.make index 47c2fa7f4..bcac8bc6d 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -107,62 +107,62 @@ hotplug_targetinstall_deps = $(STATEDIR)/hotplug.compile $(STATEDIR)/hotplug.targetinstall: $(hotplug_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,hotplug) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(HOTPLUG_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/sbin/hotplug, /sbin/hotplug, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/hotplug.functions, /etc/hotplug/hotplug.functions, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug.d/default/default.hotplug, /etc/hotplug.d/default/default.hotplug, n) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,hotplug) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(HOTPLUG_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(HOTPLUG_DIR)/sbin/hotplug, /sbin/hotplug, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/hotplug.functions, /etc/hotplug/hotplug.functions, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug.d/default/default.hotplug, /etc/hotplug.d/default/default.hotplug, n) ifdef PTXCONF_HOTPLUG_BLACKLIST - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/blacklist, /etc/hotplug/blacklist, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/blacklist, /etc/hotplug/blacklist, n) endif ifdef PTXCONF_HOTPLUG_FIRMWARE - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/firmware.agent, /etc/hotplug/firmware.agent, n) - $(call install_copy, 0, 0, 0644, /usr/lib/hotplug/firmware) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/firmware.agent, /etc/hotplug/firmware.agent, n) + @$(call install_copy, 0, 0, 0644, /usr/lib/hotplug/firmware) endif ifdef PTXCONF_HOTPLUG_IEEE1394 - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/ieee1394.agent, /etc/hotplug/ieee1394.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/ieee1394.agent, /etc/hotplug/ieee1394.agent, n) endif ifdef PTXCONF_HOTPLUG_NET - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/net.agent, /etc/hotplug/net.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/net.agent, /etc/hotplug/net.agent, n) endif ifdef PTXCONF_HOTPLUG_PCI - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/pci.agent, /etc/hotplug/pci.agent, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/pci.rc, /etc/hotplug/pci.rc, n) - $(call install_copy, 0, 0, 0644, /etc/hotplug/pci) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/pci.agent, /etc/hotplug/pci.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/pci.rc, /etc/hotplug/pci.rc, n) + @$(call install_copy, 0, 0, 0644, /etc/hotplug/pci) endif ifdef PTXCONF_HOTPLUG_SCSI - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/scsi.agent, /etc/hotplug/scsi.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/scsi.agent, /etc/hotplug/scsi.agent, n) endif ifdef PTXCONF_HOTPLUG_USB - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.agent, /etc/hotplug/usb.agent, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.distmap, /etc/hotplug/usb.distmap, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.handmap, /etc/hotplug/usb.handmap, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.usermap, /etc/hotplug/usb.usermap, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.rc, /etc/hotplug/usb.rc, n) - $(call install_copy, 0, 0, 0644, /etc/hotplug/usb.d) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.agent, /etc/hotplug/usb.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.distmap, /etc/hotplug/usb.distmap, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.handmap, /etc/hotplug/usb.handmap, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.usermap, /etc/hotplug/usb.usermap, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/usb.rc, /etc/hotplug/usb.rc, n) + @$(call install_copy, 0, 0, 0644, /etc/hotplug/usb.d) endif ifdef PTXCONF_HOTPLUG_INPUT - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/input.agent, /etc/hotplug/input.agent, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/input.rc, /etc/hotplug/input.rc, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/input.agent, /etc/hotplug/input.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/input.rc, /etc/hotplug/input.rc, n) endif ifdef PTXCONF_HOTPLUG_DASD - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.agent, /etc/hotplug/dasd.agent, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.permissions, /etc/hotplug/dasd.permissions, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.agent, /etc/hotplug/dasd.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/dasd.permissions, /etc/hotplug/dasd.permissions, n) endif ifdef PTXCONF_HOTPLUG_TAPE - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.agent, /etc/hotplug/tape.agent, n) - $(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.permissions, /etc/hotplug/tape.permissions, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.agent, /etc/hotplug/tape.agent, n) + @$(call install_copy, 0, 0, 0644, $(HOTPLUG_DIR)/etc/hotplug/tape.permissions, /etc/hotplug/tape.permissions, n) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/inetutils.make b/rules/inetutils.make index 72f42fe56..5f115c7ef 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -143,32 +143,32 @@ inetutils_targetinstall_deps = $(STATEDIR)/inetutils.compile $(STATEDIR)/inetutils.targetinstall: $(inetutils_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,inetutils) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(INETUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,inetutils) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(INETUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_INETUTILS_RCP - $(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rcp/rcp, /usr/bin/rcp) + @$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rcp/rcp, /usr/bin/rcp) endif ifdef PTXCONF_INETUTILS_RLOGIND - $(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rlogind/rlogind, /usr/sbin/rlogind) + @$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rlogind/rlogind, /usr/sbin/rlogind) endif ifdef PTXCONF_INETUTILS_RSHD - $(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rshd/rshd, /usr/bin/rshd) + @$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/rshd/rshd, /usr/bin/rshd) endif ifdef PTXCONF_INETUTILS_PING - $(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/ping/ping, /bin/ping) + @$(call install_copy, 0, 0, 0755, $(INETUTILS_DIR)/ping/ping, /bin/ping) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/ipkg.make b/rules/ipkg.make index 137b565e9..834e777d0 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -124,25 +124,23 @@ ipkg_targetinstall_deps = $(STATEDIR)/ipkg.compile $(STATEDIR)/ipkg.targetinstall: $(ipkg_targetinstall_deps) @$(call targetinfo, $@) - install -d $(ROOTDIR)/usr/bin + @$(call install_init,ipkg) + @$(call install_fixup,VERSION,$(IPKG_VERSION)) - $(call install_init,ipkg) - $(call install_fixup,VERSION,$(IPKG_VERSION)) + @$(call install_copy, 0, 0, 0644, $(IPKG_DIR)/.libs/libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0.0) + @$(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0) + @$(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0) - $(call install_copy, 0, 0, 0644, $(IPKG_DIR)/.libs/libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0.0) - $(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0.0) - $(call install_link, libipkg.so.0.0.0, /usr/lib/libipkg.so.0) - - $(call install_copy, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg) + @$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/.libs/ipkg-cl, /usr/bin/ipkg) ifdef PTXCONF_IPKG_EXTRACT_TEST - $(call install_copy, 0, 0, 0755, $(IPKG_DIR)/install_extract_test, /usr/bin/install_extract_test) + @$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/install_extract_test, /usr/bin/install_extract_test) endif ifdef PTXCONF_IPKG_HASH_TEST - $(call install_copy, 0, 0, 0755, $(IPKG_DIR)/install_hash_test, /usr/bin/install_hash_test) + @$(call install_copy, 0, 0, 0755, $(IPKG_DIR)/install_hash_test, /usr/bin/install_hash_test) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/kernel.make b/rules/kernel.make index fa75ac9bb..2a58adcc8 100644 --- a/rules/kernel.make +++ b/rules/kernel.make @@ -36,6 +36,8 @@ KERNEL_DIR = $(BUILDDIR)/$(KERNEL) KERNEL_CONFIG = $(PTXCONF_KERNEL_CONFIG) endif +KERNEL_INST_DIR = $(BUILDDIR)/$(KERNEL)-install + # # Some configuration stuff for the different kernel image formats # @@ -400,15 +402,35 @@ kernel_targetinstall_deps = $(STATEDIR)/kernel.compile $(STATEDIR)/kernel.targetinstall: $(kernel_targetinstall_deps) @$(call targetinfo, $@) + + rm -fr $(KERNEL_INST_DIR) + ifdef PTXCONF_KERNEL_INSTALL - mkdir -p $(ROOTDIR)/boot; \ - for i in $(KERNEL_TARGET_PATH); do \ - if [ -f $$i ]; then \ - install $$i $(ROOTDIR)/boot/ ; \ - fi; \ - done; \ - cd $(KERNEL_DIR) && $(KERNEL_PATH) make \ - modules_install $(KERNEL_MAKEVARS) INSTALL_MOD_PATH=$(ROOTDIR) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,kernel) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(KERNEL_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + for i in $(KERNEL_TARGET_PATH); do \ + if [ -f $$i ]; then \ + $(call install_copy, 0, 0, 0644, $$i, /boot/$(KERNEL_TARGET), n)\ + fi; \ + done + cd $(KERNEL_DIR) && $(KERNEL_PATH) make \ + modules_install $(KERNEL_MAKEVARS) INSTALL_MOD_PATH=$(KERNEL_INST_DIR) + + cd $(KERNEL_INST_DIR) && \ + for file in `find . -type f | sed -e "s/\.\//\//g"`; do \ + $(call install_copy, 0, 0, 0664, $(KERNEL_INST_DIR)/$$file, $$file, n) \ + done + + rm -fr $(KERNEL_INST_DIR) + + @$(call install_finish) endif touch $@ diff --git a/rules/memedit.make b/rules/memedit.make index 55bad50f7..1cbddc06a 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -127,18 +127,18 @@ memedit_targetinstall_deps = $(STATEDIR)/memedit.compile \ $(STATEDIR)/memedit.targetinstall: $(memedit_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,memedit) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(MEMEDIT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(MEMEDIT_DIR)/memedit, /bin/memedit) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,memedit) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(MEMEDIT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(MEMEDIT_DIR)/memedit, /bin/memedit) + + @$(call install_finish) touch $@ diff --git a/rules/mgetty.make b/rules/mgetty.make index 1ede466f6..ff647f817 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -123,46 +123,46 @@ mgetty_targetinstall_deps = $(STATEDIR)/mgetty.compile $(STATEDIR)/mgetty.targetinstall: $(mgetty_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,mgetty) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(MGETTY_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0700, $(MGETTY_DIR)/mgetty, /usr/sbin/mgetty) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,mgetty) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(MGETTY_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0700, $(MGETTY_DIR)/mgetty, /usr/sbin/mgetty) ifdef PTXCONF_MGETTY_INSTALL_CONFIG - $(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/login.config, /etc/mgetty+sendfax/login.config) - $(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/mgetty.config, /etc/mgetty+sendfax/mgetty.config) - $(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/dialin.config, /etc/mgetty+sendfax/dialin.config) + @$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/login.config, /etc/mgetty+sendfax/login.config) + @$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/mgetty.config, /etc/mgetty+sendfax/mgetty.config) + @$(call install_copy, 0, 0, 0600, $(MGETTY_DIR)/dialin.config, /etc/mgetty+sendfax/dialin.config) endif ifdef PTXCONF_MGETTY_CALLBACK - $(call install_copy, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback) + @$(call install_copy, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback) endif ifdef PTXCONF_SENDFAX - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/sendfax, /usr/sbin/sendfax) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/pbm2g3, /usr/bin/pbm2g3) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g3cat, /usr/bin/g3cat) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g32pbm, /usr/bin/g32pbm) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/sendfax, /usr/sbin/sendfax) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/pbm2g3, /usr/bin/pbm2g3) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g3cat, /usr/bin/g3cat) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/g3/g32pbm, /usr/bin/g32pbm) ifdef PTXCONF_MGETTY_INSTALL_CONFIG - $(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/sendfax.config, /etc/mgetty+sendfax/sendfax.config) + @$(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/sendfax.config, /etc/mgetty+sendfax/sendfax.config) endif ifdef PTXCONF_SENDFAX_SPOOL - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxspool, /usr/bin/faxspool) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunq, /usr/bin/faxrunq) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq, /usr/bin/faxq) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrm, /usr/bin/faxrm) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunqd, /usr/bin/faxrunqd) - $(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq-helper, /usr/lib/mgetty+sendfax/faxq-helper) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxspool, /usr/bin/faxspool) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunq, /usr/bin/faxrunq) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq, /usr/bin/faxq) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrm, /usr/bin/faxrm) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunqd, /usr/bin/faxrunqd) + @$(call install_copy, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq-helper, /usr/lib/mgetty+sendfax/faxq-helper) endif ifdef PTXCONF_MGETTY_INSTALL_CONFIG - $(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/faxrunq.config, /etc/mgetty+sendfax/faxrunq.config) + @$(call install_copy, 0, 0, 0644, $(MGETTY_DIR)/faxrunq.config, /etc/mgetty+sendfax/faxrunq.config) endif endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/mii-diag.make b/rules/mii-diag.make index eff151b94..a9ee7c8ae 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -112,18 +112,18 @@ mii-diag_targetinstall_deps = $(STATEDIR)/mii-diag.compile $(STATEDIR)/mii-diag.targetinstall: $(mii-diag_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,mii-diag) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(MII-DIAG_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(MII-DIAG_DIR)/mii-diag, /usr/sbin/mii-diag) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,mii-diag) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(MII-DIAG_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(MII-DIAG_DIR)/mii-diag, /usr/sbin/mii-diag) + + @$(call install_finish) touch $@ diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index 3411eb324..b728f91ac 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -117,41 +117,41 @@ module-init-tools_targetinstall_deps = $(STATEDIR)/module-init-tools.compile $(STATEDIR)/module-init-tools.targetinstall: $(module-init-tools_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,module-init-tools) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(MODULE_INIT_TOOLS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,module-init-tools) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(MODULE_INIT_TOOLS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_MODULE_INIT_TOOLS_INSMOD $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/insmod - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/insmod, /sbin/insmod) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/insmod, /sbin/insmod) endif ifdef PTXCONF_MODULE_INIT_TOOLS_RMMOD $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/rmmod - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/rmmod, /sbin/rmmod) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/rmmod, /sbin/rmmod) endif ifdef PTXCONF_MODULE_INIT_TOOLS_LSMOD $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/lsmod - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/lsmod, /bin/lsmod) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/lsmod, /bin/lsmod) endif ifdef PTXCONF_MODULE_INIT_TOOLS_MODINFO $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/modinfo - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modinfo, /sbin/modinfo) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modinfo, /sbin/modinfo) endif ifdef PTXCONF_MODULE_INIT_TOOLS_MODPROBE $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/modprobe - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modprobe, /sbin/modprobe) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/modprobe, /sbin/modprobe) endif ifdef PTXCONF_MODULE_INIT_TOOLS_DEPMOD $(CROSSSTRIP) -R .notes -R .comment $(MODULE_INIT_TOOLS_DIR)/depmod - $(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/depmod, /sbin/depmod) + @$(call install_copy, 0, 0, 0755, $(MODULE_INIT_TOOLS_DIR)/depmod, /sbin/depmod) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/mtd.make b/rules/mtd.make index 607b7901b..b09e409db 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -174,71 +174,71 @@ endif $(STATEDIR)/mtd.targetinstall: $(mtd_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,mtd) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(MTD_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,mtd) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(MTD_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_MTD_FLASH_ERASE - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_erase, /sbin/flash_erase) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_erase, /sbin/flash_erase) endif ifdef PTXCONF_MTD_FLASH_ERASEALL - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_eraseall, /sbin/flash_eraseall) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_eraseall, /sbin/flash_eraseall) endif ifdef PTXCONF_MTD_FLASH_INFO - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_info, /sbin/flash_info) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_info, /sbin/flash_info) endif ifdef PTXCONF_MTD_FLASH_LOCK - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_lock, /sbin/flash_lock) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_lock, /sbin/flash_lock) endif ifdef PTXCONF_MTD_FLASH_UNLOCK - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_unlock, /sbin/flash_unlock) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flash_unlock, /sbin/flash_unlock) endif ifdef PTXCONF_MTD_FLASHCP - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flashcp, /sbin/flashcp) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/flashcp, /sbin/flashcp) endif ifdef PTXCONF_MTD_FTL_CHECK - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_check, /sbin/ftl_check) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_check, /sbin/ftl_check) endif ifdef PTXCONF_MTD_FTL_FORMAT - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_format, /sbin/ftl_format) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/ftl_format, /sbin/ftl_format) endif ifdef PTXCONF_MTD_JFFS_DUMP - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs-dump, /sbin/jffs-dump) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs-dump, /sbin/jffs-dump) endif ifdef PTXCONF_MTD_JFFS2_DUMP - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2dump, /sbin/jffs2dump) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2dump, /sbin/jffs2dump) endif ifdef PTXCONF_MTD_JFFS2READER - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2reader, /sbin/jffs2reader) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/jffs2reader, /sbin/jffs2reader) endif ifdef PTXCONF_MTD_MTDDEBUG - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mtd_debug, /sbin/mtd_debug) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mtd_debug, /sbin/mtd_debug) endif ifdef PTXCONF_MTD_NANDDUMP - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nanddump, /sbin/nanddump) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nanddump, /sbin/nanddump) endif ifdef PTXCONF_MTD_NANDWRITE - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nandwrite, /sbin/nandwrite) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nandwrite, /sbin/nandwrite) endif ifdef PTXCONF_MTD_NFTL_FORMAT - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftl_format, /sbin/nftl_format) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftl_format, /sbin/nftl_format) endif ifdef PTXCONF_MTD_NFTLDUMP - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftldump, /sbin/nftldump) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/nftldump, /sbin/nftldump) endif ifdef PTXCONF_MTD_MKJFFS - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs, /sbin/mkfs.jffs) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs, /sbin/mkfs.jffs) endif ifdef PTXCONF_MTD_MKJFFS2 - $(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs2, /sbin/mkfs.jffs2) + @$(call install_copy, 0, 0, 0755, $(MTD_DIR)/util/mkfs.jffs2, /sbin/mkfs.jffs2) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/ncurses.make b/rules/ncurses.make index 073536a47..3ca6f54a5 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -144,50 +144,50 @@ ncurses_targetinstall: $(STATEDIR)/ncurses.targetinstall $(STATEDIR)/ncurses.targetinstall: $(STATEDIR)/ncurses.install @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,ncurses) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(NCURSES_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.3, /lib/libncurses.so.5.3) - $(call install_link, libncurses.so.5.3, /lib/libncurses.so.5) - $(call install_link, libncurses.so.5.3, /lib/libncurses.so) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,ncurses) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(NCURSES_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.3, /lib/libncurses.so.5.3) + @$(call install_link, libncurses.so.5.3, /lib/libncurses.so.5) + @$(call install_link, libncurses.so.5.3, /lib/libncurses.so) ifdef PTXCONF_NCURSES_FORM - $(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.3, /lib/libncurses.so.5.3) - $(call install_link, libncurses.so.5.3, /lib/libncurses.so.5) - $(call install_link, libncurses.so.5.3, /lib/libncurses.so) + @$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libncurses.so.5.3, /lib/libncurses.so.5.3) + @$(call install_link, libncurses.so.5.3, /lib/libncurses.so.5) + @$(call install_link, libncurses.so.5.3, /lib/libncurses.so) endif ifdef PTXCONF_NCURSES_MENU - $(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libmenu.so.5.3, /lib/libmenu.so.5.3) - $(call install_link, libmenu.so.5.3, /lib/libmenu.so.5) - $(call install_link, libmenu.so.5.3, /lib/libmenu.so) + @$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libmenu.so.5.3, /lib/libmenu.so.5.3) + @$(call install_link, libmenu.so.5.3, /lib/libmenu.so.5) + @$(call install_link, libmenu.so.5.3, /lib/libmenu.so) endif ifdef PTXCONF_NCURSES_PANEL - $(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libpanel.so.5.3, /lib/libpanel.so.5.3) - $(call install_link, libpanel.so.5.3, /lib/libpanel.so.5) - $(call install_link, libpanel.so.5.3, /lib/libpanel.so) + @$(call install_copy, 0, 0, 0644, $(NCURSES_DIR)/lib/libpanel.so.5.3, /lib/libpanel.so.5.3) + @$(call install_link, libpanel.so.5.3, /lib/libpanel.so.5) + @$(call install_link, libpanel.so.5.3, /lib/libpanel.so) endif ifdef PTXCONF_NCURSES_TERMCAP mkdir -p $(ROOTDIR)/usr/share/terminfo - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm, /usr/share/terminfo/x/xterm, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm-color, /usr/share/terminfo/x/xterm-color, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm-xfree86, /usr/share/terminfo/x/xterm-xfree86, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt100, /usr/share/terminfo/v/vt100, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt102, /usr/share/terminfo/v/vt102, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt200, /usr/share/terminfo/v/vt200, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/a/ansi, /usr/share/terminfo/a/ansi, n); - $(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/l/linux, /usr/share/terminfo/l/linux, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm, /usr/share/terminfo/x/xterm, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm-color, /usr/share/terminfo/x/xterm-color, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/x/xterm-xfree86, /usr/share/terminfo/x/xterm-xfree86, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt100, /usr/share/terminfo/v/vt100, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt102, /usr/share/terminfo/v/vt102, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/v/vt200, /usr/share/terminfo/v/vt200, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/a/ansi, /usr/share/terminfo/a/ansi, n); + @$(call install_copy, 0, 0, 0644, $(CROSS_LIB_DIR)/usr/share/terminfo/l/linux, /usr/share/terminfo/l/linux, n); endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/netcat.make b/rules/netcat.make index 28146abd1..ad4f5562e 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -105,18 +105,18 @@ netcat_targetinstall: $(STATEDIR)/netcat.targetinstall $(STATEDIR)/netcat.targetinstall: $(STATEDIR)/netcat.install @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,netcat) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(NETCAT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(NETCAT_DIR)/nc, /bin/nc) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,netcat) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(NETCAT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(NETCAT_DIR)/nc, /bin/nc) + + @$(call install_finish) touch $@ diff --git a/rules/pcre.make b/rules/pcre.make index f57ece32f..20b51144f 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -131,23 +131,23 @@ pcre_targetinstall_deps = $(STATEDIR)/pcre.compile $(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,pcre) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(PCRE_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1) - $(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) - $(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) - $(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0) - $(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) - $(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,pcre) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(PCRE_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1) + @$(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) + @$(call install_link, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) + @$(call install_copy, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0) + @$(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) + @$(call install_link, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) + + @$(call install_finish) touch $@ diff --git a/rules/pop3spam.make b/rules/pop3spam.make index 91f0146cf..d62682d9b 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -128,18 +128,18 @@ pop3spam_targetinstall_deps += $(STATEDIR)/pcre.targetinstall $(STATEDIR)/pop3spam.targetinstall: $(pop3spam_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,pop3spam) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(POP3SPAM_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,pop3spam) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(POP3SPAM_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0555, $(POP3SPAM_DIR)/src/pop3spam, /usr/bin/pop3spam) + @$(call install_copy, 0, 0, 0555, $(POP3SPAM_DIR)/src/pop3spam, /usr/bin/pop3spam) - $(call install_finish) + @$(call install_finish) touch $@ # ---------------------------------------------------------------------------- diff --git a/rules/proftpd.make b/rules/proftpd.make index a0bb24099..82ee2da92 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -132,18 +132,19 @@ proftpd_targetinstall: $(STATEDIR)/proftpd.targetinstall $(STATEDIR)/proftpd.targetinstall: $(STATEDIR)/proftpd.install @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,proftpd) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(PROFTPD_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(PROFTPD_DIR)/proftpd, /usr/sbin/proftpd) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,proftpd) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(PROFTPD_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(PROFTPD_DIR)/proftpd, /usr/sbin/proftpd) + @$(call install_copy, 11, 101, 0644, $(TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf, n) + + @$(call install_finish) touch $@ diff --git a/rules/readline.make b/rules/readline.make index b49399872..afad40aa3 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -128,20 +128,20 @@ readline_targetinstall_deps = $(STATEDIR)/readline.compile $(STATEDIR)/readline.targetinstall: $(readline_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,readline) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(READLINE_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(READLINE_DIR)/shlib/libreadline.so.5.0, /lib/libreadline.so.5.0) - $(call install_link, libreadline.so.5.0, /lib/libreadline.so.5) - $(call install_link, libreadline.so.5.0, /lib/libreadline.so) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,readline) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(READLINE_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(READLINE_DIR)/shlib/libreadline.so.5.0, /lib/libreadline.so.5.0) + @$(call install_link, libreadline.so.5.0, /lib/libreadline.so.5) + @$(call install_link, libreadline.so.5.0, /lib/libreadline.so) + + @$(call install_finish) touch $@ diff --git a/rules/rootfs.make b/rules/rootfs.make index ebeb1a5a2..c10c450b0 100644 --- a/rules/rootfs.make +++ b/rules/rootfs.make @@ -18,7 +18,8 @@ endif # # Paths and names # -ROOTFS = root-0.1.1 +ROOTFS_VERSION = 0.1.1 +ROOTFS = root-$(ROOTFS_VERSION) ROOTFS_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(ROOTFS).tgz ROOTFS_SOURCE = $(SRCDIR)/$(ROOTFS).tgz ROOTFS_DIR = $(BUILDDIR)/$(ROOTFS) @@ -87,140 +88,135 @@ rootfs_targetinstall: $(STATEDIR)/rootfs.targetinstall $(STATEDIR)/rootfs.targetinstall: $(STATEDIR)/rootfs.install @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,rootfs) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(ROOTFS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,rootfs) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(ROOTFS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_ROOTFS_PROC - $(call install_copy, 0, 0, 0555, /proc) + @$(call install_copy, 0, 0, 0555, /proc) endif ifdef PTXCONF_ROOTFS_DEV - $(call install_copy, 0, 0, 0755, /dev) + @$(call install_copy, 0, 0, 0755, /dev) endif ifdef PTXCONF_ROOTFS_MNT - $(call install_copy, 0, 0, 0755, /mnt) + @$(call install_copy, 0, 0, 0755, /mnt) endif ifdef PTXCONF_ROOTFS_FLOPPY - $(call install_copy, 0, 0, 0755, /floppy) + @$(call install_copy, 0, 0, 0755, /floppy) endif ifdef PTXCONF_ROOTFS_TMP - $(call install_copy, 0, 0, 1777, /tmp) + @$(call install_copy, 0, 0, 1777, /tmp) endif ifdef PTXCONF_ROOTFS_VAR - $(call install_copy, 0, 0, 0755, /var) - $(call install_copy, 0, 0, 0755, /var/log) + @$(call install_copy, 0, 0, 0755, /var) + @$(call install_copy, 0, 0, 0755, /var/log) endif ifdef PTXCONF_ROOTFS_SYS - $(call install_copy, 0, 0, 0755, /sys) + @$(call install_copy, 0, 0, 0755, /sys) endif ifdef PTXCONF_ROOTFS_HOME - # FIXME: should be drwxrwsr-x - $(call install_copy, 0, 0, 0755, /home) + @$(call install_copy, 0, 0, 2775, /home) endif ifdef PTXCONF_ROOTFS_ETC # Copy generic etc - # FIXME: some parts of this have to be put into the packet make files! - - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/fstab, /etc/fstab) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/group, /etc/group) - $(call install_copy, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/gshadow, /etc/gshadow) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hostname, /etc/hostname) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hosts, /etc/hosts) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/inittab, /etc/inittab) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/nsswitch.conf,/etc/nsswitch.conf) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/passwd, /etc/passwd) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/profile, /etc/profile) - $(call install_copy, 11, 101, 0644, $(TOPDIR)/projects/generic/etc/proftpd.conf, /etc/proftpd.conf) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/protocols, /etc/protocols) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/resolv.conf, /etc/resolv.conf) - $(call install_copy, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/shadow, /etc/shadow) - $(call install_copy, 0, 0, 0600, $(TOPDIR)/projects/generic/etc/shadow-, /etc/shadow-) - $(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/udhcpc.script,/etc/udhcpc.script) - $(call install_copy, 0, 0, 0755, /etc/init.d) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/banner, /etc/init.d/banner) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/net2flash, /etc/init.d/net2flash) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/proftpd, /etc/init.d/proftpd) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/rcS, /etc/init.d/rcS) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/utelnetd, /etc/init.d/utelnetd) - $(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/startup, /etc/init.d/startup) - $(call install_copy, 0, 0, 0755, /etc/rc.d) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/fstab, /etc/fstab, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/group, /etc/group, n) + @$(call install_copy, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/gshadow, /etc/gshadow, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hostname, /etc/hostname, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/hosts, /etc/hosts, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/inittab, /etc/inittab, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/nsswitch.conf,/etc/nsswitch.conf, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/passwd, /etc/passwd, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/profile, /etc/profile, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/protocols, /etc/protocols, n) + @$(call install_copy, 0, 0, 0644, $(TOPDIR)/projects/generic/etc/resolv.conf, /etc/resolv.conf, n) + @$(call install_copy, 0, 0, 0640, $(TOPDIR)/projects/generic/etc/shadow, /etc/shadow, n) + @$(call install_copy, 0, 0, 0600, $(TOPDIR)/projects/generic/etc/shadow-, /etc/shadow-, n) + @$(call install_copy, 0, 0, 0755, /etc/init.d) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/banner, /etc/init.d/banner, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/networking, /etc/init.d/networking, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/net2flash, /etc/init.d/net2flash, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/proftpd, /etc/init.d/proftpd, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/rcS, /etc/init.d/rcS, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/utelnetd, /etc/init.d/utelnetd, n) + @$(call install_copy, 0, 0, 0755, $(TOPDIR)/projects/generic/etc/init.d/startup, /etc/init.d/startup, n) + @$(call install_copy, 0, 0, 0755, /etc/rc.d) x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_HOSTNAME))"; \ if [ -n "$$x" ]; then \ echo $$x; \ perl -i -p -e "s,\@HOSTNAME@,$$x,g" $(ROOTDIR)/etc/hostname; \ - perl -i -p -e "s,\@HOSTNAME@,$$x,g" $(IMAGEDIR)/etc/hostname; \ + perl -i -p -e "s,\@HOSTNAME@,$$x,g" $(IMAGEDIR)/ipkg/etc/hostname; \ fi x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE))"; \ if [ -n "$$x" ]; then \ echo $$x; \ perl -i -p -e "s,\@CONSOLE@,$$x,g" $(ROOTDIR)/etc/inittab; \ - perl -i -p -e "s,\@CONSOLE@,$$x,g" $(IMAGEDIR)/etc/inittab; \ + perl -i -p -e "s,\@CONSOLE@,$$x,g" $(IMAGEDIR)/ipkg/etc/inittab; \ fi x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_CONSOLE_SPEED))"; \ if [ -n "$$x" ]; then \ echo $$x; \ perl -i -p -e "s,\@SPEED@,$$x,g" $(ROOTDIR)/etc/inittab; \ - perl -i -p -e "s,\@SPEED@,$$x,g" $(IMAGEDIR)/etc/inittab; \ + perl -i -p -e "s,\@SPEED@,$$x,g" $(IMAGEDIR)/ipkg/etc/inittab; \ fi x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_PS1))"; \ echo $$x; \ perl -i -p -e "s,\@PS1@,\"$$x\",g" $(ROOTDIR)/etc/profile; \ - perl -i -p -e "s,\@PS1@,\"$$x\",g" $(IMAGEDIR)/etc/profile; \ + perl -i -p -e "s,\@PS1@,\"$$x\",g" $(IMAGEDIR)/ipkg/etc/profile; \ x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_PS2))"; \ echo $$x; \ perl -i -p -e "s,\@PS2@,\"$$x\",g" $(ROOTDIR)/etc/profile; \ - perl -i -p -e "s,\@PS2@,\"$$x\",g" $(IMAGEDIR)/etc/profile; \ + perl -i -p -e "s,\@PS2@,\"$$x\",g" $(IMAGEDIR)/ipkg/etc/profile; \ x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_PS4))"; \ echo $$x; \ perl -i -p -e "s,\@PS4@,\"$$x\",g" $(ROOTDIR)/etc/profile; \ - perl -i -p -e "s,\@PS4@,\"$$x\",g" $(IMAGEDIR)/etc/profile; \ + perl -i -p -e "s,\@PS4@,\"$$x\",g" $(IMAGEDIR)/ipkg/etc/profile; \ x="$(call remove_quotes,$(PTXCONF_ROOTFS_ETC_VENDOR))"; \ if [ -n "$$x" ]; then \ echo $$x; \ perl -i -p -e "s,\@VENDOR@,$$x,g" $(ROOTDIR)/etc/init.d/banner; \ - perl -i -p -e "s,\@VENDOR@,$$x,g" $(IMAGEDIR)/etc/init.d/banner; \ + perl -i -p -e "s,\@VENDOR@,$$x,g" $(IMAGEDIR)/ipkg/etc/init.d/banner; \ else \ perl -i -p -e "s,\@VENDOR@,,g" $(ROOTDIR)/etc/init.d/banner; \ - perl -i -p -e "s,\@VENDOR@,,g" $(IMAGEDIR)/etc/init.d/banner; \ + perl -i -p -e "s,\@VENDOR@,,g" $(IMAGEDIR)/ipkg/etc/init.d/banner; \ fi perl -i -p -e "s,\@VERSION@,$(VERSION),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@VERSION@,$(VERSION),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@VERSION@,$(VERSION),g" $(IMAGEDIR)/ipkg/etc/init.d/banner perl -i -p -e "s,\@PATCHLEVEL@,$(PATCHLEVEL),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@PATCHLEVEL@,$(PATCHLEVEL),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@PATCHLEVEL@,$(PATCHLEVEL),g" $(IMAGEDIR)/ipkg/etc/init.d/banner perl -i -p -e "s,\@SUBLEVEL@,$(SUBLEVEL),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@SUBLEVEL@,$(SUBLEVEL),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@SUBLEVEL@,$(SUBLEVEL),g" $(IMAGEDIR)/ipkg/etc/init.d/banner perl -i -p -e "s,\@PROJECT@,$(PROJECT),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@PROJECT@,$(PROJECT),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@PROJECT@,$(PROJECT),g" $(IMAGEDIR)/ipkg/etc/init.d/banner perl -i -p -e "s,\@EXTRAVERSION@,$(EXTRAVERSION),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@EXTRAVERSION@,$(EXTRAVERSION),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@EXTRAVERSION@,$(EXTRAVERSION),g" $(IMAGEDIR)/ipkg/etc/init.d/banner perl -i -p -e "s,\@DATE@,$(shell date -Iseconds),g" $(ROOTDIR)/etc/init.d/banner - perl -i -p -e "s,\@DATE@,$(shell date -Iseconds),g" $(IMAGEDIR)/etc/init.d/banner + perl -i -p -e "s,\@DATE@,$(shell date -Iseconds),g" $(IMAGEDIR)/ipkg/etc/init.d/banner endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/smtpclient.make b/rules/smtpclient.make index 5bef3550d..12ac7b563 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -124,18 +124,18 @@ smtpclient_targetinstall_deps = $(STATEDIR)/smtpclient.compile $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,smtpclient) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(SMTPCLIENT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(SMTPCLIENT_DIR)/smtpclient, /usr/bin/smtpclient) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,smtpclient) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(SMTPCLIENT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(SMTPCLIENT_DIR)/smtpclient, /usr/bin/smtpclient) + + @$(call install_finish) touch $@ diff --git a/rules/sqlite.make b/rules/sqlite.make index 2217f8385..71b662de7 100644 --- a/rules/sqlite.make +++ b/rules/sqlite.make @@ -157,18 +157,18 @@ $(STATEDIR)/sqlite.targetinstall: $(STATEDIR)/sqlite.install @$(call targetinfo, $@) install -d $(ROOTDIR)/usr/lib - $(call install_init,default) - $(call install_fixup,PACKAGE,sqlite) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(SQLITE_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Ladislav Michl <ladis\@linux-mips.org>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0755, $(SQLITE_DIR)/libsqlite3.so, /usr/lib/libsqlite3.so) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,sqlite) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(SQLITE_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Ladislav Michl <ladis\@linux-mips.org>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0755, $(SQLITE_DIR)/libsqlite3.so, /usr/lib/libsqlite3.so) + + @$(call install_finish) touch $@ diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 87e7292c6..bcf63d4f5 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -123,24 +123,24 @@ sysfsutils_targetinstall_deps = $(STATEDIR)/sysfsutils.compile $(STATEDIR)/sysfsutils.targetinstall: $(sysfsutils_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,sysfsutils) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(SYSFSUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,sysfsutils) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(SYSFSUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_SYSFSUTILS_LIB - $(call install_copy, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.2, /lib/libsysfs.so.1.0.2) - $(call install_link, libsysfs.so.1.0.2, /lib/libsysfs.so.1) - $(call install_link, libsysfs.so.1.0.2, /lib/libsysfs.so) + @$(call install_copy, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.2, /lib/libsysfs.so.1.0.2) + @$(call install_link, libsysfs.so.1.0.2, /lib/libsysfs.so.1) + @$(call install_link, libsysfs.so.1.0.2, /lib/libsysfs.so) endif ifdef PTXCONF_SYSFSUTILS_SYSTOOL - $(call install_copy, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool) + @$(call install_copy, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool, n) endif - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/util-linux.make b/rules/util-linux.make index 5beae3950..0d0622816 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -144,37 +144,37 @@ util-linux_targetinstall_deps += $(STATEDIR)/hosttool-fakeroot.install $(STATEDIR)/util-linux.targetinstall: $(util-linux_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,util-linux) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(UTIL-LINUX_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,util-linux) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(UTIL-LINUX_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) ifdef PTXCONF_UTLNX_MKSWAP - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/disk-utils/mkswap, /sbin/mkswap) endif ifdef PTXCONF_UTLNX_SWAPON - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/swapon, /sbin/swapon) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/mount/swapon, /sbin/swapon) endif ifdef PTXCONF_UTLNX_IPCS - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/ipcs, /usr/bin/ipcs) endif ifdef PTXCONF_UTLNX_READPROFILE - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/sys-utils/readprofile, /usr/sbin/readprofile) endif ifdef PTXCONF_UTLNX_FDISK - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/fdisk, /usr/sbin/fdisk) endif ifdef PTXCONF_UTLNX_SFDISK - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/sfdisk, /usr/sbin/sfdisk) endif ifdef PTXCONF_UTLNX_CFDISK - $(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk) + @$(call install_copy, 0, 0, 0755, $(UTIL-LINUX_DIR)/fdisk/cfdisk, /usr/sbin/cfdisk) endif - $(call install_finish) + @$(call install_finish) touch $@ # ---------------------------------------------------------------------------- diff --git a/rules/virtual-libc.make b/rules/virtual-libc.make index f42ffd3e7..fe9391677 100644 --- a/rules/virtual-libc.make +++ b/rules/virtual-libc.make @@ -20,14 +20,12 @@ VIRTUAL += virtual-libc virtual-libc_install: $(STATEDIR)/virtual-libc.install -ifdef PTXCONF_LIBC ifdef PTXCONF_GLIBC virtual-libc_install_deps = $(STATEDIR)/glibc.install endif ifdef PTXCONF_UCLIBC virtual-libc_install_deps = $(STATEDIR)/uclibc.install endif -endif $(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps) @$(call targetinfo, $@) @@ -39,14 +37,12 @@ $(STATEDIR)/virtual-libc.install: $(virtual-libc_install_deps) virtual-libc_targetinstall: $(STATEDIR)/virtual-libc.targetinstall -ifdef PTXCONF_LIBC ifdef PTXCONF_GLIBC virtual-libc_targetinstall_deps = $(STATEDIR)/glibc.targetinstall endif ifdef PTXCONF_UCLIBC virtual-libc_targetinstall_deps = $(STATEDIR)/uclibc.targetinstall endif -endif $(STATEDIR)/virtual-libc.targetinstall: $(virtual-libc_targetinstall_deps) @$(call targetinfo, $@) diff --git a/rules/xlibs-x11.make b/rules/xlibs-x11.make index 54dfce4cd..050ba21b6 100644 --- a/rules/xlibs-x11.make +++ b/rules/xlibs-x11.make @@ -130,23 +130,23 @@ xlibs-x11_targetinstall_deps = $(STATEDIR)/xlibs-x11.compile $(STATEDIR)/xlibs-x11.targetinstall: $(xlibs-x11_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,xlibs-x11) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(XLIBS-X11_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, \ + @$(call install_init,default) + @$(call install_fixup,PACKAGE,xlibs-x11) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(XLIBS-X11_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, \ $(XLIBS-X11_DIR)/src/.libs/libX11.so.$(XLIBS-X11_REAL_VERSION), \ /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION) \ ) - $(call install_link, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so.6) - $(call install_link, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so) + @$(call install_link, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so.6) + @$(call install_link, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/xlibs-xau.make b/rules/xlibs-xau.make index 712cc9ab3..7cf6fec75 100644 --- a/rules/xlibs-xau.make +++ b/rules/xlibs-xau.make @@ -126,20 +126,20 @@ xlibs-xau_targetinstall_deps = $(STATEDIR)/xlibs-xau.compile $(STATEDIR)/xlibs-xau.targetinstall: $(xlibs-xau_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,xlibs-xau) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(XLIBS_XAU_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,xlibs-xau) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(XLIBS_XAU_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0644, $(XLIBS-XAU_DIR)/.libs/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0.0.0) - $(call install_link, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0) - $(call install_link, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so) + @$(call install_copy, 0, 0, 0644, $(XLIBS-XAU_DIR)/.libs/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0.0.0) + @$(call install_link, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0) + @$(call install_link, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/xlibs-xext.make b/rules/xlibs-xext.make index f24ecee9c..c897fe230 100644 --- a/rules/xlibs-xext.make +++ b/rules/xlibs-xext.make @@ -129,21 +129,21 @@ xlibs-xext_targetinstall_deps = $(STATEDIR)/xlibs-xext.compile $(STATEDIR)/xlibs-xext.targetinstall: $(xlibs-xext_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,coreutils) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(COREUTILS_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,coreutils) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(COREUTILS_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_root, 0, 0, 0644, $(XLIBS-XEXT_DIR)/.libs/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION)) + @$(call install_root, 0, 0, 0644, $(XLIBS-XEXT_DIR)/.libs/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION)) $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION) - $(call install_link, /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so.6) - $(call install_link, /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so) + @$(call install_link, /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so.6) + @$(call install_link, /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/xlibs-xfont.make b/rules/xlibs-xfont.make index 026d7fea5..5102d1d99 100644 --- a/rules/xlibs-xfont.make +++ b/rules/xlibs-xfont.make @@ -128,29 +128,29 @@ xlibs-xfont_targetinstall_deps = $(STATEDIR)/xlibs-xfont.compile $(STATEDIR)/xlibs-xfont.targetinstall: $(xlibs-xfont_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,xlibs-xfont) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(XLIBS-XFONT_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,xlibs-xfont) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(XLIBS-XFONT_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) - $(call install_copy, 0, 0, 0644, \ + @$(call install_copy, 0, 0, 0644, \ $(XLIBS-XFONT_DIR)/.libs/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), \ /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION) \ ) - $(call install_link, \ + @$(call install_link, \ /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), \ /usr/X11R6/lib/libXfont.so.0 \ ) - $(call install_link, /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libXfont.so) - $(call install_copy, 0, 0, 0644, $(XLIBS-XFONT_DIR)/fontcache/.libs/libfontcache.so.0.0.0, /usr/X11R6/lib/libfontcache.so.0.0.0) - $(call install_link, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so.0) - $(call install_link, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so) + @$(call install_link, /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libXfont.so) + @$(call install_copy, 0, 0, 0644, $(XLIBS-XFONT_DIR)/fontcache/.libs/libfontcache.so.0.0.0, /usr/X11R6/lib/libfontcache.so.0.0.0) + @$(call install_link, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so.0) + @$(call install_link, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so) - $(call install_finish) + @$(call install_finish) touch $@ diff --git a/rules/xlibs-xtst.make b/rules/xlibs-xtst.make index d2ddef585..11513b680 100644 --- a/rules/xlibs-xtst.make +++ b/rules/xlibs-xtst.make @@ -128,21 +128,21 @@ xlibs-xtst_targetinstall_deps += $(STATEDIR)/xlibs-recordext.targetinstall $(STATEDIR)/xlibs-xtst.targetinstall: $(xlibs-xtst_targetinstall_deps) @$(call targetinfo, $@) - $(call install_init,default) - $(call install_fixup,PACKAGE,xlibs-xtst) - $(call install_fixup,PRIORITY,optional) - $(call install_fixup,VERSION,$(XLIBS-XTST_VERSION)) - $(call install_fixup,SECTION,base) - $(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") - $(call install_fixup,DEPENDS,libc) - $(call install_fixup,DESCRIPTION,missing) - - $(call install_copy, 0, 0, 0644, $(XLIBS-XTST_DIR)/.libs/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6.2.1) - $(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6) - $(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.6) - $(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so) - - $(call install_finish) + @$(call install_init,default) + @$(call install_fixup,PACKAGE,xlibs-xtst) + @$(call install_fixup,PRIORITY,optional) + @$(call install_fixup,VERSION,$(XLIBS-XTST_VERSION)) + @$(call install_fixup,SECTION,base) + @$(call install_fixup,AUTHOR,"Robert Schwebel <r.schwebel\@pengutronix.de>") + @$(call install_fixup,DEPENDS,libc) + @$(call install_fixup,DESCRIPTION,missing) + + @$(call install_copy, 0, 0, 0644, $(XLIBS-XTST_DIR)/.libs/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6.2.1) + @$(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6) + @$(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.6) + @$(call install_link, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so) + + @$(call install_finish) touch $@ |