Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bernhard Fischer <rep.dot.nop@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom	shareware wad file be more generic
Date: Thu, 24 Jul 2008 16:33:41 +0200	[thread overview]
Message-ID: <20080724143341.GA4991@mx.loc> (raw)
In-Reply-To: <1216905717-9197-1-git-send-email-hans-christian.egtvedt@atmel.com>

On Thu, Jul 24, 2008 at 03:21:53PM +0200, Hans-Christian Egtvedt wrote:
>This patch will let the user install the Doom shareware wad file if lxdoom or
>lsdldoom is selected. The wad file will also be installed into
>/usr/share/games/doom directory, since the client will search this directory
>when starting.

weeeeh
http://www.ggi-project.org/screenshots.html
>
>The Makefile rule has also been altered to depend on the installed wad file, so
>it will be multiple project safe.
>
>Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
>---
> package/lxdoom/Config.in     |    6 ++++--
> package/lxdoom/lxdoom-wad.mk |   10 +++++-----
> 2 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/package/lxdoom/Config.in b/package/lxdoom/Config.in
>index 892e45c..3b318e1 100644
>--- a/package/lxdoom/Config.in
>+++ b/package/lxdoom/Config.in
>@@ -3,7 +3,9 @@ config BR2_PACKAGE_LXDOOM
> 	help
> 	  This is the linux version of the popular doom game.
> config BR2_PACKAGE_LXDOOM_WAD
>-	bool "lxdoom-wad"
>+	bool "doom shareware wad file"
> 	depends on BR2_PACKAGE_LXDOOM
> 	help
>-	  This is the shareware wad data files for the doom game.
>+	  This will install the the shareware wad data file for the doom game.

the the the contains a surplus the ;)

>+
>+	  The wad file will be placed in /usr/share/games/doom/doom1.wad
>diff --git a/package/lxdoom/lxdoom-wad.mk b/package/lxdoom/lxdoom-wad.mk
>index 41b8ed8..4e38574 100644
>--- a/package/lxdoom/lxdoom-wad.mk
>+++ b/package/lxdoom/lxdoom-wad.mk
>@@ -15,14 +15,14 @@ $(DL_DIR)/$(LXDOOM_WAD_SOURCE):
> $(LXDOOM_WAD_DIR)/.unpacked: $(DL_DIR)/$(LXDOOM_WAD_SOURCE)
> 	mkdir -p $(LXDOOM_WAD_DIR)
> 	cp -f $(DL_DIR)/$(LXDOOM_WAD_SOURCE) $(LXDOOM_WAD_DIR)
>-	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE) 
>+	gunzip -d $(LXDOOM_WAD_DIR)/$(LXDOOM_WAD_SOURCE)

no. There is no gunzip. So who added this stuff? I'm 100% sure that when
i left there were no hardcoded decompressors in there. You should listen
to what user say (resp. configure).

> 	touch $@
> 
>-$(LXDOOM_WAD_DIR)/.installed: $(LXDOOM_WAD_DIR)/.unpacked
>-	cp -f $(LXDOOM_WAD_DIR)/* $(TARGET_DIR)/usr/games
>-	touch $@
>+$(TARGET_DIR)/usr/share/games/doom/doom1.wad: $(LXDOOM_WAD_DIR)/.unpacked
>+	mkdir -p $(TARGET_DIR)/usr/share/games/doom
>+	cp -f $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@

$(INSTALL) -D $(LXDOOM_WAD_DIR)/doom-$(LXDOOM_WAD_VERSION).wad $@

It's not only shorter but also avoiding broken cp and mkdir
implementations and is IMO the preferred way to copy stuff.

  parent reply	other threads:[~2008-07-24 14:33 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-24 13:21 [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Hans-Christian Egtvedt
2008-07-24 13:21 ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Hans-Christian Egtvedt
2008-07-24 13:21   ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Hans-Christian Egtvedt
2008-07-24 13:21     ` [Buildroot] [PATCH 4/5] lxdoom-wad: enable kconfig entry for PrBoom package Hans-Christian Egtvedt
2008-07-24 13:21       ` [Buildroot] [PATCH 5/5] lxdoom: make package depend on X11 server Hans-Christian Egtvedt
2008-07-24 13:23         ` Hans-Christian Egtvedt
2008-07-24 14:37           ` Bernhard Fischer
2008-07-24 14:35     ` [Buildroot] [PATCH 3/5] PrBoom: add new package PrBoom Bernhard Fischer
2008-07-24 14:35   ` [Buildroot] [PATCH 2/5] SDL_net: add new package SDL_net Bernhard Fischer
2008-07-24 14:33 ` Bernhard Fischer [this message]
2008-07-24 14:45   ` [Buildroot] [PATCH 1/5] lxdoom-wad: make installation of Doom shareware wad file be more generic Peter Korsgaard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080724143341.GA4991@mx.loc \
    --to=rep.dot.nop@gmail.com \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox