From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <ptxdist-bounces@pengutronix.de>
Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c])
	by metis.ext.pengutronix.de with esmtp (Exim 4.72)
	(envelope-from <alex.aring@gmail.com>) id 1WwHPG-00058k-RG
	for ptxdist@pengutronix.de; Sun, 15 Jun 2014 22:52:03 +0200
Received: by mail-wg0-f44.google.com with SMTP id x13so4669546wgg.15
	for <ptxdist@pengutronix.de>; Sun, 15 Jun 2014 13:51:57 -0700 (PDT)
Received: from omega (p20030064A93CC6BDE2CB4EFFFE1BB546.dip0.t-ipconnect.de.
	[2003:64:a93c:c6bd:e2cb:4eff:fe1b:b546])
	by mx.google.com with ESMTPSA id w9sm29075044eev.4.2014.06.15.13.51.56
	for <ptxdist@pengutronix.de>
	(version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
	Sun, 15 Jun 2014 13:51:56 -0700 (PDT)
Date: Sun, 15 Jun 2014 22:51:51 +0200
From: Alexander Aring <alex.aring@gmail.com>
Message-ID: <20140615205145.GA16097@omega>
References: <1402862806-7297-1-git-send-email-alex.aring@gmail.com>
	<1402862806-7297-3-git-send-email-alex.aring@gmail.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <1402862806-7297-3-git-send-email-alex.aring@gmail.com>
Subject: Re: [ptxdist] [PATCH 3/4] kbd: rework and version bump 1.15.2 ->
	2.0.1
Reply-To: ptxdist@pengutronix.de
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/pipermail/ptxdist>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
	<mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: ptxdist-bounces@pengutronix.de
Errors-To: ptxdist-bounces@pengutronix.de
To: ptxdist@pengutronix.de

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