From 01ab55645df76cf5515a11a612108620849a0007 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 15 Apr 2009 05:52:00 +0000 Subject: [PATCH 1/4] Initialize branch F-11 for kBuild --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..25c7708 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-11 From 07c565e680ee09cabd0d2686d82c47474f2959f8 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Sat, 25 Apr 2009 06:22:54 +0000 Subject: [PATCH 2/4] - Update to later patchlevel to support VirtualBox 2.2.0 --- .cvsignore | 2 +- kBuild-0.1.5-revert2027.patch | 36 ----------------------------------- kBuild.spec | 11 ++++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 41 deletions(-) delete mode 100644 kBuild-0.1.5-revert2027.patch diff --git a/.cvsignore b/.cvsignore index b4e4eae..572f794 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kBuild-0.1.5-src.tar.gz +kBuild-0.1.5-p1-src.tar.gz diff --git a/kBuild-0.1.5-revert2027.patch b/kBuild-0.1.5-revert2027.patch deleted file mode 100644 index 491f10f..0000000 --- a/kBuild-0.1.5-revert2027.patch +++ /dev/null @@ -1,36 +0,0 @@ -This reverts commit 2027 which breaks the build. - -Index: src/kmk/commands.c -=================================================================== ---- src/kmk/commands.c (revision 2027) -+++ src/kmk/commands.c (revision 2026) -@@ -656,9 +656,6 @@ - - if (file->precious || file->phony) - return; --#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET -- assert (!file->multi_maybe); --#endif - - #ifndef NO_ARCHIVES - if (ar_name (file->name)) -@@ -713,19 +710,6 @@ - for (d = child->file->also_make; d != 0; d = d->next) - delete_target (d->file, child->file->name); - --#ifdef CONFIG_WITH_EXPLICIT_MULTITARGET -- /* Also remove any multi target siblings, except for the 'maybe' ones (we -- handle that here) and precious ones (delete_target deals with that). -- Note that CHILD is always the multi target head (see remake.c). */ -- if (child->file == child->file->multi_head) -- { -- struct file *f2; -- for (f2 = child->file->multi_next; f2; f2 = f2->multi_next) -- if (!f2->multi_maybe) -- delete_target (f2, child->file->name); -- } --#endif -- - child->deleted = 1; - } - diff --git a/kBuild.spec b/kBuild.spec index 5d84034..f6035b4 100644 --- a/kBuild.spec +++ b/kBuild.spec @@ -1,6 +1,8 @@ +%global patchlevel p1 + Name: kBuild Version: 0.1.5 -Release: 4%{?dist} +Release: 5%{?patchlevel:.%{patchlevel}}%{?dist} Summary: A cross-platform build environment Group: Development/Tools @@ -8,7 +10,7 @@ License: BSD and GPLv2+ # most tools are from NetBSD, some are from FreeBSD, # and make and sed are from GNU URL: http://svn.netlabs.org/kbuild -Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}-src.tar.gz +Source0: ftp://ftp.netlabs.org/pub/kbuild/%{name}-%{version}%{?patchlevel:-%{patchlevel}}-src.tar.gz Patch0: kBuild-0.1.3-escape.patch Patch1: kBuild-0.1.5-dprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -27,7 +29,7 @@ repository. %prep -%setup -q +%setup -q -n %{name}-%{version}%{?patchlevel:-%{patchlevel}} %patch0 -p1 -b .escape %patch1 -p1 -b .dprintf @@ -75,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Apr 25 2009 Lubomir Rintel - 0.1.5-5.p1 +- Update to later patchlevel to support VirtualBox 2.2.0 + * Mon Apr 13 2009 Lubomir Rintel - 0.1.5-4 - Fix typoes (Robert P. J. Day, #495393) - Comment out the colliding dprintf diff --git a/sources b/sources index da54911..a075fc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df7e0905232e67728643f97d63cbf3f3 kBuild-0.1.5-src.tar.gz +148f821c0f9e729a1f65bc91e69f6e7a kBuild-0.1.5-p1-src.tar.gz From 3ce78c9fbf2d40aa6c90ce8caa6e11a523e23e85 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:20:24 +0000 Subject: [PATCH 3/4] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8c8870e..e463081 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: kBuild -# $Id$ +# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ NAME := kBuild SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 17965fd00b78cc0b2400010c34d0a3a207659aea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 18:57:37 +0000 Subject: [PATCH 4/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e463081..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: kBuild -# $Id: Makefile,v 1.1 2008/12/25 00:36:01 kevin Exp $ -NAME := kBuild -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 25c7708..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-11