diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-06-26 11:29:26 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2020-06-26 13:00:21 +0200 |
| commit | d251916e78d3fa3a336139812346e9badb2f8d22 (patch) | |
| tree | 6ed148c248d5698ec5239d99abdad524f246cec9 /rules/templates | |
| parent | c655f3bb7123a3cec87af23435cd77c3910f2c83 (diff) | |
| download | ptxdist-d251916e78d3fa3a336139812346e9badb2f8d22.tar.gz ptxdist-d251916e78d3fa3a336139812346e9badb2f8d22.tar.xz | |
template: src-{cmake,meson,qmake}-prog: cleanup targetinstall stage
Explicitly install just the binary provided by the template.
Otherwise, the ugly 'for' loop is often never removed from the final
package.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/templates')
| -rw-r--r-- | rules/templates/template-src-cmake-prog-make | 16 | ||||
| -rw-r--r-- | rules/templates/template-src-meson-prog-make | 16 | ||||
| -rw-r--r-- | rules/templates/template-src-qmake-prog-make | 15 |
3 files changed, 18 insertions, 29 deletions
diff --git a/rules/templates/template-src-cmake-prog-make b/rules/templates/template-src-cmake-prog-make index 35caca6c3..cc47ca49e 100644 --- a/rules/templates/template-src-cmake-prog-make +++ b/rules/templates/template-src-cmake-prog-make @@ -53,17 +53,13 @@ $(STATEDIR)/@package@.targetinstall: @$(call install_fixup, @package@, AUTHOR, "@AUTHOR@") @$(call install_fixup, @package@, DESCRIPTION, missing) -# # -# # example code:; copy all binaries -# # +# # This is an example only. Adapt it to your requirements. Read the +# # documentation's section "Make it Work" in chapter "Adding new Packages" +# # how to prepare this content or/and read chapter +# # "Rule File Macro Reference" to get an idea of the available macros +# # you can use here and how to use them. - @for i in $(shell cd $(@PACKAGE@_PKGDIR) && find bin sbin usr/bin usr/sbin -type f); do \ - $(call install_copy, @package@, 0, 0, 0755, -, /$$i); \ - done - -# # -# # FIXME: add all necessary things here -# # + @$(call install_copy, @package@, 0, 0, 0755, -, /usr/bin/@package@) @$(call install_finish, @package@) diff --git a/rules/templates/template-src-meson-prog-make b/rules/templates/template-src-meson-prog-make index 581e463ca..5396db40c 100644 --- a/rules/templates/template-src-meson-prog-make +++ b/rules/templates/template-src-meson-prog-make @@ -54,17 +54,13 @@ $(STATEDIR)/@package@.targetinstall: @$(call install_fixup, @package@, AUTHOR, "@AUTHOR@") @$(call install_fixup, @package@, DESCRIPTION, missing) -# # -# # example code:; copy all binaries -# # +# # This is an example only. Adapt it to your requirements. Read the +# # documentation's section "Make it Work" in chapter "Adding new Packages" +# # how to prepare this content or/and read chapter +# # "Rule File Macro Reference" to get an idea of the available macros +# # you can use here and how to use them. - @for i in $(shell cd $(@PACKAGE@_PKGDIR) && find bin sbin usr/bin usr/sbin -type f); do \ - $(call install_copy, @package@, 0, 0, 0755, -, /$$i); \ - done - -# # -# # FIXME: add all necessary things here -# # + @$(call install_copy, @package@, 0, 0, 0755, -, /usr/bin/@package@) @$(call install_finish, @package@) diff --git a/rules/templates/template-src-qmake-prog-make b/rules/templates/template-src-qmake-prog-make index 921fb313f..142a1d039 100644 --- a/rules/templates/template-src-qmake-prog-make +++ b/rules/templates/template-src-qmake-prog-make @@ -54,17 +54,14 @@ $(STATEDIR)/@package@.targetinstall: @$(call install_fixup, @package@, AUTHOR, "@AUTHOR@") @$(call install_fixup, @package@, DESCRIPTION, missing) -# # -# # example code:; copy all binaries -# # +# # This is an example only. Adapt it to your requirements. Read the +# # documentation's section "Make it Work" in chapter "Adding new Packages" +# # how to prepare this content or/and read chapter +# # "Rule File Macro Reference" to get an idea of the available macros +# # you can use here and how to use them. - @for i in $(shell cd $(@PACKAGE@_PKGDIR) && find bin sbin usr/bin usr/sbin -type f); do \ - $(call install_copy, @package@, 0, 0, 0755, -, /$$i); \ - done + @$(call install_copy, @package@, 0, 0, 0755, -, /usr/bin/@package@) -# # -# # FIXME: add all necessary things here -# # @$(call install_finish, @package@) |