diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-22 09:17:44 +0000 |
|---|---|---|
| committer | Robert Schwebel <r.schwebel@pengutronix.de> | 2005-04-22 09:17:44 +0000 |
| commit | e4c3655349a73fe1d49b17e0efb703309b9f2a65 (patch) | |
| tree | bf3d653f5b6cf2d318d7583bbbc71a06ec571327 | |
| parent | ee650f2fdb8437ab15215d6f9d4ef9e6740d0a02 (diff) | |
| download | ptxdist-e4c3655349a73fe1d49b17e0efb703309b9f2a65.tar.gz ptxdist-e4c3655349a73fe1d49b17e0efb703309b9f2a65.tar.xz | |
ipkgized some packets
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.7-trunk@2502 33e552b5-05e3-0310-8538-816dae2090ed
34 files changed, 327 insertions, 103 deletions
diff --git a/rules/bing.make b/rules/bing.make index 07571ae96..8ba3e314e 100644 --- a/rules/bing.make +++ b/rules/bing.make @@ -136,6 +136,7 @@ $(STATEDIR)/bing.targetinstall: $(bing_targetinstall_deps) bing_clean: rm -rf $(STATEDIR)/bing.* + rm -rf $(IMAGEDIR)/bing_* rm -rf $(BING_DIR) # vim: syntax=make diff --git a/rules/bonniexx.make b/rules/bonniexx.make index 407807152..b4825686a 100644 --- a/rules/bonniexx.make +++ b/rules/bonniexx.make @@ -124,7 +124,20 @@ bonniexx_targetinstall_deps = $(STATEDIR)/bonniexx.compile $(STATEDIR)/bonniexx.targetinstall: $(bonniexx_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(BONNIEXX_DIR)/bonnie++,/usr/bin/bonnie++) + + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -133,6 +146,7 @@ $(STATEDIR)/bonniexx.targetinstall: $(bonniexx_targetinstall_deps) bonniexx_clean: rm -rf $(STATEDIR)/bonniexx.* + rm -rf $(IMAGEDIR)/bonniexx_* rm -rf $(BONNIEXX_DIR) # vim: syntax=make diff --git a/rules/canconfig.make b/rules/canconfig.make index e10e44fab..34d093910 100644 --- a/rules/canconfig.make +++ b/rules/canconfig.make @@ -20,9 +20,9 @@ endif # CANCONFIG_VERSION = 0.0.1 CANCONFIG = canconfig-$(CANCONFIG_VERSION) -CANCONFIG_SUFFIX = tar.gz +CANCONFIG_SUFFIX = tar.gz CANCONFIG_URL = http://www.pengutronix.de/software/ptxdist/temporary-src/$(CANCONFIG).$(CANCONFIG_SUFFIX) -CANCONFIG_SOURCE = $(SRCDIR)/$(CANCONFIG).$(CANCONFIG_SUFFIX) +CANCONFIG_SOURCE = $(SRCDIR)/$(CANCONFIG).$(CANCONFIG_SUFFIX) CANCONFIG_DIR = $(BUILDDIR)/$(CANCONFIG) # ---------------------------------------------------------------------------- @@ -113,7 +113,20 @@ canconfig_targetinstall_deps = $(STATEDIR)/canconfig.compile $(STATEDIR)/canconfig.targetinstall: $(canconfig_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0755, $(CANCONFIG_DIR)/canconfig, /usr/sbin/canconfig) + + $(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 $@ # ---------------------------------------------------------------------------- @@ -122,6 +135,7 @@ $(STATEDIR)/canconfig.targetinstall: $(canconfig_targetinstall_deps) canconfig_clean: rm -rf $(STATEDIR)/canconfig.* + rm -rf $(IMAGEDIR)/canconfig_* rm -rf $(CANCONFIG_DIR) # vim: syntax=make diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index 7b3e6735b..9b169beef 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -151,5 +151,6 @@ endif e2fsprogs_clean: rm -rf $(STATEDIR)/e2fsprogs.* $(E2FSPROGS_DIR) $(E2FSPROGS_BUILD_DIR) + rm -rf $(IMAGEDIR)/e2fsprogs_* # vim: syntax=make diff --git a/rules/efax.make b/rules/efax.make index f2966532d..55ee60280 100644 --- a/rules/efax.make +++ b/rules/efax.make @@ -120,8 +120,21 @@ efax_targetinstall_deps = $(STATEDIR)/efax.compile $(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps) @$(call targetinfo, $@) - @$(call copy_root, 0, 0, 0755, $(EFAX_DIR)/efax, /usr/bin/efax) - @$(call copy_root, 0, 0, 0755, $(EFAX_DIR)/efix, /usr/bin/efix) + + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -130,6 +143,7 @@ $(STATEDIR)/efax.targetinstall: $(efax_targetinstall_deps) efax_clean: rm -rf $(STATEDIR)/efax.* + rm -rf $(IMAGEDIR)/efax_* rm -rf $(EFAX_DIR) # vim: syntax=make diff --git a/rules/expat.make b/rules/expat.make index e4d585f51..7b8b04a0c 100644 --- a/rules/expat.make +++ b/rules/expat.make @@ -147,6 +147,7 @@ $(STATEDIR)/expat.targetinstall: $(expat_targetinstall_deps) expat_clean: rm -rf $(STATEDIR)/expat.* + rm -rf $(IMAGEDIR)/expat_* rm -rf $(EXPAT_DIR) # vim: syntax=make diff --git a/rules/fbtest.make b/rules/fbtest.make index 75371f501..fb9601b0b 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -113,8 +113,20 @@ fbtest_targetinstall_deps = $(STATEDIR)/fbtest.compile $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0755, $(FBTEST_DIR)/$(PTXCONF_COMPILER_PREFIX)fbtest, /sbin/fbtest) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/fbtest + + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -123,6 +135,7 @@ $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps) fbtest_clean: rm -rf $(STATEDIR)/fbtest.* + rm -rf $(IMAGEDIR)/fbtest_* rm -rf $(FBTEST_DIR) # vim: syntax=make diff --git a/rules/fbutils.make b/rules/fbutils.make index 971cad743..49be75988 100644 --- a/rules/fbutils.make +++ b/rules/fbutils.make @@ -115,26 +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) + ifdef PTXCONF_FBUTILS_FBSET - $(call copy_root, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/fbset + $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbset/fbset, /sbin/fbset) endif ifdef PTXCONF_FBUTILS_FBCMAP - $(call copy_root, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/fbcmap + $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbcmap/fbcmap, /sbin/fbcmap) endif ifdef PTXCONF_FBUTILS_FBCONVERT - $(call copy_root, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/fbconvert + $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) endif ifdef PTXCONF_FBUTILS_FBCONVERT - $(call copy_root, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/fbconvert + $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/fbconvert/fbconvert, /sbin/fbconvert) endif ifdef PTXCONF_FBUTILS_CON2FBMAP - $(call copy_root, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/sbin/con2fbmap + $(call install_copy, 0, 0, 0755, $(FBUTILS_DIR)/con2fbmap/con2fbmap, /sbin/con2fbmap) endif + $(call install_finish) touch $@ @@ -144,6 +149,7 @@ endif fbutils_clean: rm -rf $(STATEDIR)/fbutils.* + rm -rf $(IMAGEDIR)/fbutils_* rm -rf $(FBUTILS_DIR) # vim: syntax=make diff --git a/rules/figlet.make b/rules/figlet.make index 825fea55a..a4f78e462 100644 --- a/rules/figlet.make +++ b/rules/figlet.make @@ -141,6 +141,7 @@ $(STATEDIR)/figlet.targetinstall: $(figlet_targetinstall_deps) figlet_clean: rm -rf $(STATEDIR)/figlet.* + rm -rf $(IMAGEDIR)/figlet_* rm -rf $(FIGLET_DIR) # vim: syntax=make diff --git a/rules/gdb.make b/rules/gdb.make index 64ca5bcb7..6b480c2ff 100644 --- a/rules/gdb.make +++ b/rules/gdb.make @@ -173,5 +173,6 @@ $(STATEDIR)/gdb.targetinstall: $(gdb_targetinstall_deps) gdb_clean: rm -rf $(STATEDIR)/gdb.* $(GDB_DIR) + rm -rf $(IMAGEDIR)/gdb_* # vim: syntax=make diff --git a/rules/gdbserver.make b/rules/gdbserver.make index ec7396b46..48afddb2c 100644 --- a/rules/gdbserver.make +++ b/rules/gdbserver.make @@ -125,5 +125,6 @@ $(STATEDIR)/gdbserver.targetinstall: $(STATEDIR)/gdbserver.compile gdbserver_clean: rm -rf $(STATEDIR)/gdbserver.* $(GDBSERVER_BUILDDIR) + rm -rf $(IMAGEDIR)/gdbserver_* # vim: syntax=make diff --git a/rules/glib26.make b/rules/glib26.make index 4ce2a0d42..89113c01a 100644 --- a/rules/glib26.make +++ b/rules/glib26.make @@ -134,25 +134,32 @@ glib26_targetinstall_deps = $(STATEDIR)/glib26.compile $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(GLIB26_DIR)/glib/.libs/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0.600.1) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libglib-2.0.so.0.600.1 - $(call link_root, /usr/lib/libglib-2.0.so.0.600.1, /usr/lib/libglib-2.0.so.0) - $(call link_root, /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 copy_root, 0, 0, 0644, $(GLIB26_DIR)/gobject/.libs/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0.600.1) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libgobject-2.0.so.0.600.1 - $(call link_root, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so.0) - $(call link_root, /usr/lib/libgobject-2.0.so.0.600.1, /usr/lib/libgobject-2.0.so) - - $(call copy_root, 0, 0, 0644, $(GLIB26_DIR)/gmodule/.libs/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0.600.1) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libgmodule-2.0.so.0.600.1 - $(call link_root, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-2.0.so.0) - $(call link_root, /usr/lib/libgmodule-2.0.so.0.600.1, /usr/lib/libgmodule-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 copy_root, 0, 0, 0644, $(GLIB26_DIR)/gthread/.libs/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0.600.1) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/lib/libgthread-2.0.so.0.600.1 - $(call link_root, /usr/lib/libgthread-2.0.so.0.600.1, /usr/lib/libgthread-2.0.so.0) - $(call link_root, /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) touch $@ @@ -162,6 +169,7 @@ $(STATEDIR)/glib26.targetinstall: $(glib26_targetinstall_deps) glib26_clean: rm -rf $(STATEDIR)/glib26.* + rm -rf $(IMAGEDIR)/glib26_* rm -rf $(GLIB26_DIR) rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/glib-2.0*.pc rm -f $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/share/pkg-config/gmodule-2.0*.pc diff --git a/rules/hexedit.make b/rules/hexedit.make index fea6d0f24..5c82248d0 100644 --- a/rules/hexedit.make +++ b/rules/hexedit.make @@ -149,6 +149,7 @@ $(STATEDIR)/hexedit.targetinstall: $(hexedit_targetinstall_deps) hexedit_clean: rm -rf $(STATEDIR)/hexedit.* + rm -rf $(IMAGEDIR)/hexedit_* rm -rf $(HEXEDIT_DIR) # vim: syntax=make diff --git a/rules/hotplug.make b/rules/hotplug.make index badc29b79..47c2fa7f4 100644 --- a/rules/hotplug.make +++ b/rules/hotplug.make @@ -172,6 +172,7 @@ endif hotplug_clean: rm -rf $(STATEDIR)/hotplug.* + rm -rf $(IMAGEDIR)/hotplug_* rm -rf $(HOTPLUG_DIR) # vim: syntax=make diff --git a/rules/inetutils.make b/rules/inetutils.make index aeb6c2b58..72f42fe56 100644 --- a/rules/inetutils.make +++ b/rules/inetutils.make @@ -178,6 +178,7 @@ endif inetutils_clean: rm -rf $(STATEDIR)/inetutils.* + rm -rf $(IMAGEDIR)/inetutils_* rm -rf $(INETUTILS_DIR) # vim: syntax=make diff --git a/rules/ipkg.make b/rules/ipkg.make index 7d1693355..137b565e9 100644 --- a/rules/ipkg.make +++ b/rules/ipkg.make @@ -152,6 +152,7 @@ endif ipkg_clean: rm -rf $(STATEDIR)/ipkg.* + rm -rf $(IMAGEDIR)/ipkg_* rm -rf $(IPKG_DIR) # vim: syntax=make diff --git a/rules/memedit.make b/rules/memedit.make index 8f2510eeb..55bad50f7 100644 --- a/rules/memedit.make +++ b/rules/memedit.make @@ -148,6 +148,7 @@ $(STATEDIR)/memedit.targetinstall: $(memedit_targetinstall_deps) memedit_clean: rm -rf $(STATEDIR)/memedit.* + rm -rf $(IMAGEDIR)/memedit_* rm -rf $(MEMEDIT_DIR) # vim: syntax=make diff --git a/rules/mgetty.make b/rules/mgetty.make index a0f24697a..1ede466f6 100644 --- a/rules/mgetty.make +++ b/rules/mgetty.make @@ -122,46 +122,48 @@ mgetty_targetinstall_deps = $(STATEDIR)/mgetty.compile $(STATEDIR)/mgetty.targetinstall: $(mgetty_targetinstall_deps) @$(call targetinfo, $@) - mkdir -p $(ROOTDIR)/usr/bin - mkdir -p $(ROOTDIR)/usr/sbin + + $(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 - mkdir -p $(ROOTDIR)/etc/mgetty+sendfax - $(call copy_root, 0, 0, 0600, $(MGETTY_DIR)/login.config, /etc/mgetty+sendfax/login.config) - $(call copy_root, 0, 0, 0600, $(MGETTY_DIR)/mgetty.config, /etc/mgetty+sendfax/mgetty.config) - $(call copy_root, 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 - $(call copy_root, 0, 0, 0700, $(MGETTY_DIR)/mgetty, /usr/sbin/mgetty) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/mgetty ifdef PTXCONF_MGETTY_CALLBACK - $(call copy_root, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/callback + $(call install_copy, 0, 0, 4755, $(MGETTY_DIR)/callback/callback, /usr/sbin/callback) endif ifdef PTXCONF_SENDFAX - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/sendfax, /usr/sbin/sendfax) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/sbin/sendfax - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/g3/pbm2g3, /usr/bin/pbm2g3) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/pbm2g3 - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/g3/g3cat, /usr/bin/g3cat) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/g3cat - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/g3/g32pbm, /usr/bin/g32pbm) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/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 copy_root, 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 copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxspool, /usr/bin/faxspool) - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunq, /usr/bin/faxrunq) - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq, /usr/bin/faxq) - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrm, /usr/bin/faxrm) - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxrunqd, /usr/bin/faxrunqd) - mkdir -p $(ROOTDIR)/usr/lib/mgetty+sendfax - $(call copy_root, 0, 0, 0755, $(MGETTY_DIR)/fax/faxq-helper, /usr/lib/mgetty+sendfax/faxq-helper) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/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 copy_root, 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) + touch $@ # ---------------------------------------------------------------------------- @@ -170,6 +172,7 @@ endif mgetty_clean: rm -rf $(STATEDIR)/mgetty.* + rm -rf $(IMAGEDIR)/mgetty_* rm -rf $(MGETTY_DIR) # vim: syntax=make diff --git a/rules/mii-diag.make b/rules/mii-diag.make index ad7a787a0..eff151b94 100644 --- a/rules/mii-diag.make +++ b/rules/mii-diag.make @@ -133,6 +133,7 @@ $(STATEDIR)/mii-diag.targetinstall: $(mii-diag_targetinstall_deps) mii-diag_clean: rm -rf $(STATEDIR)/mii-diag.* + rm -rf $(IMAGEDIR)/mii-diag_* rm -rf $(MII-DIAG_DIR) # vim: syntax=make diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make index 99398a29e..3411eb324 100644 --- a/rules/module-init-tools.make +++ b/rules/module-init-tools.make @@ -161,6 +161,7 @@ endif module-init-tools_clean: rm -rf $(STATEDIR)/module-init-tools.* + rm -rf $(IMAGEDIR)/module-init-tools_* rm -rf $(MODULE_INIT_TOOLS_DIR) # vim: syntax=make diff --git a/rules/mtd.make b/rules/mtd.make index 99279995b..607b7901b 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -248,6 +248,7 @@ endif mtd_clean: rm -rf $(STATEDIR)/mtd.* + rm -rf $(IMAGEDIR)/mtd_* rm -rf $(MTD_DIR) # vim: syntax=make diff --git a/rules/ncurses.make b/rules/ncurses.make index 84a635291..073536a47 100644 --- a/rules/ncurses.make +++ b/rules/ncurses.make @@ -197,5 +197,6 @@ endif ncurses_clean: rm -rf $(STATEDIR)/ncurses.* $(NCURSES_DIR) + rm -rf $(IMAGEDIR)/ncurses_* # vim: syntax=make diff --git a/rules/netcat.make b/rules/netcat.make index 7d86a1cf5..28146abd1 100644 --- a/rules/netcat.make +++ b/rules/netcat.make @@ -104,8 +104,20 @@ netcat_targetinstall: $(STATEDIR)/netcat.targetinstall $(STATEDIR)/netcat.targetinstall: $(STATEDIR)/netcat.install @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0755, $(NETCAT_DIR)/nc, /bin/nc) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/bin/nc + + $(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 $@ # ---------------------------------------------------------------------------- @@ -114,5 +126,6 @@ $(STATEDIR)/netcat.targetinstall: $(STATEDIR)/netcat.install netcat_clean: rm -rf $(STATEDIR)/netcat.* $(NETCAT_DIR) + rm -fr $(IMAGEDIR)/netcat_* # vim: syntax=make diff --git a/rules/pcre.make b/rules/pcre.make index d58e686ac..f57ece32f 100644 --- a/rules/pcre.make +++ b/rules/pcre.make @@ -131,12 +131,23 @@ pcre_targetinstall_deps = $(STATEDIR)/pcre.compile $(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcre.so.0.0.1, /usr/lib/libpcre.so.0.0.1) - $(call link_root, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so.0) - $(call link_root, /usr/lib/libpcre.so.0.0.1, /usr/lib/libpcre.so) - $(call copy_root, 0, 0, 0644, $(PCRE_DIR)/.libs/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0.0.0) - $(call link_root, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0) - $(call link_root, /usr/lib/libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so) + $(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 $@ @@ -146,6 +157,7 @@ $(STATEDIR)/pcre.targetinstall: $(pcre_targetinstall_deps) pcre_clean: rm -rf $(STATEDIR)/pcre.* + rm -rf $(IMAGEDIR)/pcre_* rm -rf $(PCRE_DIR) # vim: syntax=make diff --git a/rules/pop3spam.make b/rules/pop3spam.make index 4a4a61e6f..91f0146cf 100644 --- a/rules/pop3spam.make +++ b/rules/pop3spam.make @@ -127,7 +127,19 @@ pop3spam_targetinstall_deps += $(STATEDIR)/pcre.targetinstall $(STATEDIR)/pop3spam.targetinstall: $(pop3spam_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0555, $(POP3SPAM_DIR)/src/pop3spam, /usr/bin/pop3spam) + + $(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_finish) touch $@ # ---------------------------------------------------------------------------- @@ -136,6 +148,7 @@ $(STATEDIR)/pop3spam.targetinstall: $(pop3spam_targetinstall_deps) pop3spam_clean: rm -rf $(STATEDIR)/pop3spam.* + rm -rf $(IMAGEDIR)/pop3spam_* rm -rf $(POP3SPAM_DIR) # vim: syntax=make diff --git a/rules/proftpd.make b/rules/proftpd.make index 77abb9f4a..a0bb24099 100644 --- a/rules/proftpd.make +++ b/rules/proftpd.make @@ -153,5 +153,6 @@ $(STATEDIR)/proftpd.targetinstall: $(STATEDIR)/proftpd.install proftpd_clean: rm -rf $(STATEDIR)/proftpd.* $(PROFTPD_DIR) + rm -rf $(IMAGEDIR)/proftpd_* # vim: syntax=make diff --git a/rules/readline.make b/rules/readline.make index d5b978908..b49399872 100644 --- a/rules/readline.make +++ b/rules/readline.make @@ -151,6 +151,7 @@ $(STATEDIR)/readline.targetinstall: $(readline_targetinstall_deps) readline_clean: rm -rf $(STATEDIR)/readline.* + rm -rf $(IMAGEDIR)/readline_* rm -rf $(READLINE_DIR) # vim: syntax=make diff --git a/rules/smtpclient.make b/rules/smtpclient.make index 8d3b63c0c..5bef3550d 100644 --- a/rules/smtpclient.make +++ b/rules/smtpclient.make @@ -123,8 +123,20 @@ smtpclient_targetinstall_deps = $(STATEDIR)/smtpclient.compile $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(SMTPCLIENT_DIR)/smtpclient, /usr/bin/smtpclient) - $(CROSS_STRIP) -R .note -R .comment $(ROOTDIR)/usr/bin/smtpclient + + $(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 $@ # ---------------------------------------------------------------------------- @@ -133,6 +145,7 @@ $(STATEDIR)/smtpclient.targetinstall: $(smtpclient_targetinstall_deps) smtpclient_clean: rm -rf $(STATEDIR)/smtpclient.* + rm -rf $(IMAGEDIR)/smtpclient_* rm -rf $(SMTPCLIENT_DIR) # vim: syntax=make diff --git a/rules/sysfsutils.make b/rules/sysfsutils.make index 3f01df80a..87e7292c6 100644 --- a/rules/sysfsutils.make +++ b/rules/sysfsutils.make @@ -122,15 +122,26 @@ 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) + ifdef PTXCONF_SYSFSUTILS_LIB - $(call copy_root, 0, 0, 0644, $(SYSFSUTILS_DIR)/lib/.libs/libsysfs.so.1.0.2, /lib/libsysfs.so.1.0.2) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/lib/libsysfs.so.1.0.2 - $(call link_root, libsysfs.so.1.0.2, /lib/libsysfs.so.1) - $(call link_root, 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 copy_root, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool) + $(call install_copy, 0, 0, 0775, $(SYSFSUTILS_DIR)/cmd/systool, /bin/systool) endif + $(call install_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -139,6 +150,7 @@ endif sysfsutils_clean: rm -rf $(STATEDIR)/sysfsutils.* + rm -rf $(IMAGEDIR)/sysfsutils_* rm -rf $(SYSFSUTILS_DIR) # vim: syntax=make diff --git a/rules/xlibs-x11.make b/rules/xlibs-x11.make index 1b74c82ab..54dfce4cd 100644 --- a/rules/xlibs-x11.make +++ b/rules/xlibs-x11.make @@ -129,10 +129,25 @@ xlibs-x11_targetinstall_deps = $(STATEDIR)/xlibs-x11.compile $(STATEDIR)/xlibs-x11.targetinstall: $(xlibs-x11_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(XLIBS-X11_DIR)/src/.libs/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION)) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION) - $(call link_root, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so.6) - $(call link_root, /usr/X11R6/lib/libX11.so.$(XLIBS-X11_REAL_VERSION), /usr/X11R6/lib/libX11.so) + + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -141,6 +156,7 @@ $(STATEDIR)/xlibs-x11.targetinstall: $(xlibs-x11_targetinstall_deps) xlibs-x11_clean: rm -rf $(STATEDIR)/xlibs-x11.* + rm -rf $(IMAGEDIR)/xlibs-x11_* rm -rf $(XLIBS-X11_DIR) # vim: syntax=make diff --git a/rules/xlibs-xau.make b/rules/xlibs-xau.make index b8d72ef35..712cc9ab3 100644 --- a/rules/xlibs-xau.make +++ b/rules/xlibs-xau.make @@ -125,10 +125,22 @@ xlibs-xau_targetinstall_deps = $(STATEDIR)/xlibs-xau.compile $(STATEDIR)/xlibs-xau.targetinstall: $(xlibs-xau_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(XLIBS-XAU_DIR)/.libs/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0.0.0) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libXau.so.0.0.0 - $(call link_root, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so.0) - $(call link_root, /usr/X11R6/lib/libXau.so.0.0.0, /usr/X11R6/lib/libXau.so) + + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -137,6 +149,7 @@ $(STATEDIR)/xlibs-xau.targetinstall: $(xlibs-xau_targetinstall_deps) xlibs-xau_clean: rm -rf $(STATEDIR)/xlibs-xau.* + rm -rf $(IMAGEDIR)/xlibs-xau_* rm -rf $(XLIBS-XAU_DIR) # vim: syntax=make diff --git a/rules/xlibs-xext.make b/rules/xlibs-xext.make index 84b1ab19c..f24ecee9c 100644 --- a/rules/xlibs-xext.make +++ b/rules/xlibs-xext.make @@ -128,10 +128,23 @@ xlibs-xext_targetinstall_deps = $(STATEDIR)/xlibs-xext.compile $(STATEDIR)/xlibs-xext.targetinstall: $(xlibs-xext_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_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_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)) $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION) - $(call link_root, /usr/X11R6/lib/libXext.so.$(XLIBS-XEXT_REAL_VERSION), /usr/X11R6/lib/libXext.so.6) - $(call link_root, /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) + touch $@ # ---------------------------------------------------------------------------- @@ -140,6 +153,7 @@ $(STATEDIR)/xlibs-xext.targetinstall: $(xlibs-xext_targetinstall_deps) xlibs-xext_clean: rm -rf $(STATEDIR)/xlibs-xext.* + rm -rf $(IMAGEDIR)/xlibs-xext_* rm -rf $(XLIBS-XEXT_DIR) # vim: syntax=make diff --git a/rules/xlibs-xfont.make b/rules/xlibs-xfont.make index 4643f1802..026d7fea5 100644 --- a/rules/xlibs-xfont.make +++ b/rules/xlibs-xfont.make @@ -127,14 +127,31 @@ xlibs-xfont_targetinstall_deps = $(STATEDIR)/xlibs-xfont.compile $(STATEDIR)/xlibs-xfont.targetinstall: $(xlibs-xfont_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(XLIBS-XFONT_DIR)/.libs/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION)) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION) - $(call link_root, /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libXfont.so.0) - $(call link_root, /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libXfont.so) - $(call copy_root, 0, 0, 0644, $(XLIBS-XFONT_DIR)/fontcache/.libs/libfontcache.so.0.0.0, /usr/X11R6/lib/libfontcache.so.0.0.0) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libfontcache.so.0.0.0 - $(call link_root, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so.0) - $(call link_root, /usr/X11R6/lib/libfontcache.so.$(XLIBS-XFONT_REAL_VERSION), /usr/X11R6/lib/libfontcache.so) + + $(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, \ + $(XLIBS-XFONT_DIR)/.libs/libXfont.so.$(XLIBS-XFONT_REAL_VERSION), \ + /usr/X11R6/lib/libXfont.so.$(XLIBS-XFONT_REAL_VERSION) \ + ) + $(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_finish) + touch $@ # ---------------------------------------------------------------------------- @@ -143,6 +160,7 @@ $(STATEDIR)/xlibs-xfont.targetinstall: $(xlibs-xfont_targetinstall_deps) xlibs-xfont_clean: rm -rf $(STATEDIR)/xlibs-xfont.* + rm -rf $(IMAGEDIR)/xlibs-xfont_* rm -rf $(XLIBS-XFONT_DIR) # vim: syntax=make diff --git a/rules/xlibs-xtst.make b/rules/xlibs-xtst.make index 0ed0ad42c..d2ddef585 100644 --- a/rules/xlibs-xtst.make +++ b/rules/xlibs-xtst.make @@ -128,11 +128,21 @@ xlibs-xtst_targetinstall_deps += $(STATEDIR)/xlibs-recordext.targetinstall $(STATEDIR)/xlibs-xtst.targetinstall: $(xlibs-xtst_targetinstall_deps) @$(call targetinfo, $@) - $(call copy_root, 0, 0, 0644, $(XLIBS-XTST_DIR)/.libs/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6.2.1) - $(CROSSSTRIP) -R .note -R .comment $(ROOTDIR)/usr/X11R6/lib/libXtst.so.6.2.1 - $(call link_root, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so.6) - $(call link_root, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.6) - $(call link_root, /usr/X11R6/lib/libXtst.so.6.2.1, /usr/X11R6/lib/libXtst.so) + $(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 $@ @@ -142,6 +152,7 @@ $(STATEDIR)/xlibs-xtst.targetinstall: $(xlibs-xtst_targetinstall_deps) xlibs-xtst_clean: rm -rf $(STATEDIR)/xlibs-xtst.* + rm -rf $(IMAGEDIR)/xlibs-xtst_* rm -rf $(XLIBS-XTST_DIR) # vim: syntax=make |