| Message ID | 1416244750-24256-5-git-send-email-guido@vanguardiasur.com.ar |
|---|---|
| State | Superseded |
| Headers | show |
Guido, All, On 2014-11-17 14:19 -0300, Guido Martínez spake thusly: > in order to not depend on the previous permissions of the file > > Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> > --- > package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > index ebf23e4..48a50de 100644 > --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > @@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa > MATCHBOX_KEYBOARD_CONF_ENV = expat=yes > > define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES > - cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ > + $(INSTALL) -m 0755 ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ This should be: $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh \ $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh That is: - full path to the destination file. Otherwise, if $(TARGET_DIR)/usr/bin does not exist (in case of a custom skeleton, for example), 'install' will create a file named "$(TARGET_DIR)/usr/bin" instead of creating a directory and copying into it; - the leading ./ to the source is not needed. Regards, Yann E. MORIN. > endef > > MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES > -- > 2.1.3 >
Hi Yann, all, On Mon, Nov 17, 2014 at 10:44:46PM +0100, Yann E. MORIN wrote: > Guido, All, > > On 2014-11-17 14:19 -0300, Guido Martínez spake thusly: > > in order to not depend on the previous permissions of the file > > > > Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> > > --- > > package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > > index ebf23e4..48a50de 100644 > > --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > > +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk > > @@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa > > MATCHBOX_KEYBOARD_CONF_ENV = expat=yes > > > > define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES > > - cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ > > + $(INSTALL) -m 0755 ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ > > This should be: > > $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh \ > $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh > > That is: > - full path to the destination file. Otherwise, if $(TARGET_DIR)/usr/bin > does not exist (in case of a custom skeleton, for example), > 'install' will create a file named "$(TARGET_DIR)/usr/bin" instead > of creating a directory and copying into it; > - the leading ./ to the source is not needed. Actually the trailing slash prevents the file being created as /usr/bin, but the build would fail anyway. I changed it to your suggestion to be skeleton-agnostic. Thanks!
diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk index ebf23e4..48a50de 100644 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk @@ -15,7 +15,7 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa MATCHBOX_KEYBOARD_CONF_ENV = expat=yes define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - cp -dpf ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ + $(INSTALL) -m 0755 ./package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/ endef MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
in order to not depend on the previous permissions of the file Signed-off-by: Guido Martínez <guido@vanguardiasur.com.ar> --- package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)