Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 -> 2.0.1

[Alexander Aring <alex.aring@gmail.com>]

Hi,

sorry my testing failed here.

On Sun, Jun 15, 2014 at 10:06:45PM +0200, Alexander Aring wrote:
...

>  # ----------------------------------------------------------------------------
>  # Target-Install
>  # ----------------------------------------------------------------------------
> @@ -55,32 +80,51 @@ $(STATEDIR)/kbd.targetinstall:
>  	@$(call install_fixup, kbd,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>")
>  	@$(call install_fixup, kbd,DESCRIPTION,missing)
>  
> -ifdef PTXCONF_KBD_DUMPKEYS
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/dumpkeys)
> -endif
> +	@$(foreach tool,$(KBD_TOOLS-y), \
> +		$(call install_copy, kbd, 0, 0, 0755, -, \
> +		/usr/bin/$(tool));)
>  
> -ifdef PTXCONF_KBD_LOADKEYS
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/loadkeys)
> +ifdef PTXCONF_KBD_PSFXTABLE
> +	@$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
> +	@$(call install_link, kbd, psfxtable, /usr/bin/psfgettable)
> +	@$(call install_link, kbd, psfxtable, /usr/bin/psfstriptable)
>  endif
>  
> -ifdef PTXCONF_KBD_GETKEYCODES
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/getkeycodes)
> -endif
>  
> -ifdef PTXCONF_KBD_SETKEYCODES
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/setkeycodes)
> +ifdef PTXCONF_KBD_CONSOLEFONTS
> +	@cd $(KBD_PKGDIR)/usr/share/consolefonts; \
> +	find . -type f | while read file; do \
> +                $(call install_copy, kbd, 0, 0, 0644, -, \
> +                        /usr/share/consolefonts/$$file); \
> +        done
>  endif
>  
> -ifdef PTXCONF_KBD_SHOWKEY
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/showkey)
> +ifdef PTXCONF_KBD_CONSOLETRANS
> +	@cd $(KBD_PKGDIR)/usr/share/consoletrans; \
> +	find . -type f | while read file; do \
> +                $(call install_copy, kbd, 0, 0, 0644, -, \
> +                        /usr/share/consoletrans/$$file); \
> +        done
>  endif
>  
> -ifdef PTXCONF_KBD_CHVT
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/chvt)
> +ifdef PTXCONF_KBD_KEYMAPS
> +	@cd $(KBD_PKGDIR)/usr/share/keymaps; \
> +	find . -type f | while read file; do \
> +                $(call install_copy, kbd, 0, 0, 0644, -, \
> +                        /usr/share/keymaps/$$file); \
> +        done
> +
> +	@$(call install_link, kbd, mac, ppc)

This should be @$(call install_link, kbd, mac, /usr/share/keymaps/ppc)
>  endif
>  
> -ifdef PTXCONF_KBD_DEALLOCVT
> -	@$(call install_copy, kbd, 0, 0, 0755, -, /usr/bin/deallocvt)
> +ifdef PTXCONF_KBD_UNIMAPS
> +	@cd $(KBD_PKGDIR)/usr/share/unimaps; \
> +	find . -type f | while read file; do \
> +                $(call install_copy, kbd, 0, 0, 0644, -, \
> +                        /usr/share/unimaps/$$file); \
> +        done
> +
> +	@$(call install_link, kbd, mac, ppc)

This should be removed, copy&paste failure.

Sorry, I will send a v2 if the rest seems to be okay.

- Alex

-- 
ptxdist mailing list
ptxdist@pengutronix.de