(no commit message)

diff --git a/AA-README b/AA-README
new file mode 100644 (file)
index 0000000..86fb25d
--- /dev/null
+++ b/AA-README
@@ -0,0 +1,16 @@
+This package provides a vserver-capable kernel for plain fedora 12
+boxes it should be rebuilt on a fedora 12 host
+
+This package is *NOT* intended to be a basis for a PlanetLab nodes
+kernel 
+
+In a nutshell, we take the upstream kernel source rpm, and
+sneak the plain vserver patch as an addition before the fedora patches
+are applied; only a few of the fedora patches needed to be tweaked b/c
+they were working on an area that the vserver patch had altered.
+
+We use this, together with util-vserver that we rebuild as well, in order
+to set up the planetlab build and test architecture.
+
+FYI, a centos5.4 vserver box cannot easily create f11 or f12 vservers,
+due to a disruptive change in rpm

diff --git a/Makefile b/Makefile
index fd36706..85bc85b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,21 +73,23 @@ new-sources: download-sources
        done
 
 PREPARCH ?= noarch
-RPMDIRDEFS = --define "_sourcedir $(PWD)" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"
+RPMDIRDEFS = --define "_sourcedir $(PWD)/SOURCES" --define "_builddir $(PWD)" --define "_srcrpmdir $(PWD)" --define "_rpmdir $(PWD)"
 trees: sources
        rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bp --target $(PREPARCH) $(SPECFILE)
 
 # use the stock source rpm, unwrap it,
+# copy the downloaded material
 # install our own specfile and patched patches
 # and patch configs for IPV6
 # then rewrap with rpm
 srpm: sources
-       mkdir SOURCES SRPMS
+       mkdir -p SOURCES SRPMS
        (cd SOURCES; rpm2cpio ../$(SOURCE_RPM) | cpio -diu; \
         cp ../$(SPECFILE) . ; cp ../linux*.patch . ; \
+        for downloaded in $(SOURCEFILES) ; do cp ../$$downloaded . ; done ; \
         sed -i -e s,CONFIG_IPV6=m,CONFIG_IPV6=y, config-generic)
        ./rpmmacros.sh
-       export HOME=$(shell pwd) ; rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs SOURCES/$(SPECFILE)
+       export HOME=$(shell pwd) ; rpmbuild $(RPMDIRDEFS) $(RPMDEFS) --nodeps -bs $(SPECFILE)
        cp $(SOURCE_RPM) $(EXPECTED_SRPM)
 
 TARGET ?= $(shell uname -m)