From 628d887f5cf5c32c2d3f23c981f35c3cb84a4d49 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 27 Aug 2009 00:01:45 -0700 Subject: dash_0.5.2.bb: Add recipe for latest dash. Remove unbuildable dash_0.5.2 recipe. Add checksums for new dash and diffstat Signed-off-by: Khem Raj --- recipes/dash/dash_0.5.2.bb | 30 ------------------------------ recipes/dash/dash_0.5.5.1.bb | 29 +++++++++++++++++++++++++++++ recipes/dash/files/makefile-build-cc.diff | 28 +++++++++++----------------- 3 files changed, 40 insertions(+), 47 deletions(-) delete mode 100644 recipes/dash/dash_0.5.2.bb create mode 100644 recipes/dash/dash_0.5.5.1.bb (limited to 'recipes/dash') diff --git a/recipes/dash/dash_0.5.2.bb b/recipes/dash/dash_0.5.2.bb deleted file mode 100644 index ee4e8c1bd6..0000000000 --- a/recipes/dash/dash_0.5.2.bb +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION = "The Debian Almquist Shell is a POSIX compliant shell that is much smaller than 'bash'." -PROVIDES = "virtual/sh" -LICENSE = "BSD GPL" -PR = "r1" - -SRC_URI = "http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}.orig.tar.gz \ - http://snapshot.debian.net/archive/2005/07/11/debian/pool/main/d/dash/dash_0.5.2-6.diff.gz;patch=1 \ - file://makefile-build-cc.diff;patch=1" - -inherit autotools - -bindir = "/bin" -PREFIX="${bindir}" - -# dont use update-alternatives class because since we are dealing with /bin/sh -# we need to do the remove in pkg_prerm where the /bin/sh link still points -# to something (postrm is a shell script) - -ALTERNATIVE_NAME = "sh" -ALTERNATIVE_PATH = "${bindir}/dash" -ALTERNATIVE_PRIORITY = "10" -ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" - -pkg_postinst() { -update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} -} - -pkg_prerm() { -update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} -} diff --git a/recipes/dash/dash_0.5.5.1.bb b/recipes/dash/dash_0.5.5.1.bb new file mode 100644 index 0000000000..7a88407925 --- /dev/null +++ b/recipes/dash/dash_0.5.5.1.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "The Debian Almquist Shell is a POSIX compliant shell that is much smaller than 'bash'." +PROVIDES = "virtual/sh" +LICENSE = "BSD GPL" + +SRC_URI = "http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}.orig.tar.gz \ + http://ftp.debian.org/debian/pool/main/d/dash/dash_${PV}-2.3.diff.gz;patch=1 \ + file://makefile-build-cc.diff;patch=1" + +inherit autotools + +bindir = "/bin" +PREFIX="${bindir}" + +# dont use update-alternatives class because since we are dealing with /bin/sh +# we need to do the remove in pkg_prerm where the /bin/sh link still points +# to something (postrm is a shell script) + +ALTERNATIVE_NAME = "sh" +ALTERNATIVE_PATH = "${bindir}/dash" +ALTERNATIVE_PRIORITY = "10" +ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" + +pkg_postinst() { +update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} +} + +pkg_prerm() { +update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} +} diff --git a/recipes/dash/files/makefile-build-cc.diff b/recipes/dash/files/makefile-build-cc.diff index 8ffd6c2c37..a980a83324 100644 --- a/recipes/dash/files/makefile-build-cc.diff +++ b/recipes/dash/files/makefile-build-cc.diff @@ -1,29 +1,23 @@ ---- dash-0.5.1/src/Makefile.am.orig 2004-07-03 05:13:27.000000000 +0200 -+++ dash-0.5.1/src/Makefile.am 2005-01-11 11:14:11.896299544 +0100 -@@ -3,6 +3,7 @@ - AM_CPPFLAGS = -include $(top_builddir)/config.h - AM_YFLAGS = -d - -+BUILD_CC ?= gcc - CFLAGS = -g -O2 -Wall - DEFS = \ - -DBSD=1 -DSMALL -DSHELL \ -@@ -35,6 +36,18 @@ - mktokens mkbuiltins builtins.def mkinit.c \ +Index: dash-0.5.5.1/src/Makefile.am +=================================================================== +--- dash-0.5.5.1.orig/src/Makefile.am 2009-01-13 15:37:13.000000000 -0800 ++++ dash-0.5.5.1/src/Makefile.am 2009-08-26 23:56:58.879275498 -0700 +@@ -44,6 +44,18 @@ + mktokens mkbuiltins builtins.def.in mkinit.c \ mknodes.c nodetypes nodes.c.pat mksyntax.c mksignames.c +mknodes: -+ $(BUILD_CC) mknodes.c -o mknodes ++ $(COMPILE_FOR_BUILD) mknodes.c -o mknodes + +mksyntax: -+ $(BUILD_CC) mksyntax.c -o mksyntax ++ $(COMPILE_FOR_BUILD) mksyntax.c -o mksyntax + +mkinit: -+ $(BUILD_CC) mkinit.c -o mkinit ++ $(COMPILE_FOR_BUILD) mkinit.c -o mkinit + +mksignames: -+ $(BUILD_CC) mksignames.c -o mksignames -+ ++ $(COMPILE_FOR_BUILD) mksignames.c -o mksignames ++ token.h: mktokens sh $^ -- cgit v1.2.3