From 5f359d6804ea104d5217305acc4b66a95403ef2a Mon Sep 17 00:00:00 2001 From: freesource Date: Sun, 22 Dec 2002 04:54:12 +0000 Subject: [PATCH] Getting prepared for nest1. --- Makefile.pkg | 19 +++++++++++-------- gbootroot_pkg | 4 +++- pkg/dpkg/gbootroot-nest1/control | 4 +++- pkg/dpkg/gbootroot-nest1/rules | 2 +- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.pkg b/Makefile.pkg index 187d4a6..1295533 100644 --- a/Makefile.pkg +++ b/Makefile.pkg @@ -14,14 +14,14 @@ KERNEL=$(BASE_DIR)/user-mode-linux/usr/bin/linuxbr IMAGE=$(BASE_DIR)/root_filesystem/root_fs_helper KERNEL_DIR=$(BASE_DIR)/linux-$(VERSION) KERNEL_SOURCE=linux-$(VERSION).tar.bz2 -KERNEL_1_SITE=http://www.uk.kernel.org/pub/linux/kernel/v2.4 http://www.us.kernel.org/pub/linux/kernel/v2.4 http://www.au.kernel.org/pub/linux/kernel/v2.4 http://www.at.kernel.org/pub/linux/kernel/v2.4 http://www.br.kernel.org/pub/linux/kernel/v2.4 http://www.hr.kernel.org/pub/linux/kernel/v2.4 http://www.fr.kernel.org/pub/linux/kernel/v2.4 http://www.de.kernel.org/pub/linux/kernel/v2.4 http://www.il.kernel.org/pub/linux/kernel/v2.4 http://www.kr.kernel.org/pub/linux/kernel/v2.4 +KERNEL_1_SITE=http://www.uk.kernel.org/pub/linux/kernel/v2.4 http://www.us.kernel.org/pub/linux/kernel/v2.4 http://www.au.kernel.org/pub/linux/kernel/v2.4 http://www.at.kernel.org/pub/linux/kernel/v2.4 http://www.br.kernel.org/pub/linux/kernel/v2.4 http://www.hr.kernel.org/pub/linux/kernel/v2.4 http://www.fr.kernel.org/pub/linux/kernel/v2.4 http://www.de.kernel.org/pub/linux/kernel/v2.4 http://www.il.kernel.org/pub/linux/kernel/v2.4 http://www.kr.kernel.org/pub/linux/kernel/v2.4 -PATCH_1_SITE=http://uml.stearns.org/mirror http://uml-pub.ists.dartmouth.edu/uml http://ftp.nl.linux.org/pub/uml http://mirror.math.leidenuniv.nl/uml-pub.ists.dartmouth.edu +PATCH_1_SITE=http://jdike.stearns.org/mirror http://uml-pub.ists.dartmouth.edu/uml http://ftp.nl.linux.org/pub/uml http://mirror.math.leidenuniv.nl/uml-pub.ists.dartmouth.edu PATCH_1=uml-patch-$(VERSION)-$(PATCH_VERSION).bz2 PATCH_2=$(BASE_DIR)/user-mode-linux/usr/lib/uml/cramfs-vfs-order.patch -MODE=tt +#MODE=tt KCONFIG_FILE=config -KCONFIG=$(BASE_DIR)/user-mode-linux/usr/lib/uml/${KCONFIG_FILE} +KCONFIG=$(BASE_DIR)/user-mode-linux/usr/lib/uml/$(KCONFIG_FILE) # Genext2fs GENEXT2_DIR=$(BASE_DIR)/genext2fs @@ -39,7 +39,8 @@ sources: @if [ ! -e $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \ while [ ! -f $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; do \ for URL in $(KERNEL_1_SITE) ; do \ - if [ ! -f $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \ wget -t1 -P $(SOURCE_DIR) --passive $$URL/$(KERNEL_1_SITE) ; \ + if [ ! -f $(SOURCE_DIR)/$(KERNEL_SOURCE) ] ; then \ + wget -t1 -P $(SOURCE_DIR) --passive $$URL/$(KERNEL_SOURCE) ; \ fi; \ done; \ done; \ @@ -47,7 +48,8 @@ sources: @if [ ! -e $(SOURCE_DIR)/$(UTILITIES) ] ; then \ while [ ! -f $(SOURCE_DIR)/$(UTILITIES) ] ; do \ for URL in $(PATCH_1_SITE) ; do \ - if [ ! -f $(SOURCE_DIR)/$(UTILITIES) ] ; then \ wget -t2 -P $(SOURCE_DIR) --passive $$URL/$(UTILITIES) ; \ + if [ ! -f $(SOURCE_DIR)/$(UTILITIES) ] ; then \ + wget -t2 -P $(SOURCE_DIR) --passive $$URL/$(UTILITIES) ; \ fi; \ done; \ done; \ @@ -58,7 +60,8 @@ sources: @if [ ! -e $(SOURCE_DIR)/$(PATCH_1) ] ; then \ while [ ! -f $(SOURCE_DIR)/$(PATCH_1) ] ; do \ for URL in $(PATCH_1_SITE) ; do \ - if [ ! -f $(SOURCE_DIR)/$(PATCH_1) ] ; then \ wget -t2 -P $(SOURCE_DIR) --passive $$URL/$(PATCH_1) ; \ + if [ ! -f $(SOURCE_DIR)/$(PATCH_1) ] ; then \ + wget -t2 -P $(SOURCE_DIR) --passive $$URL/$(PATCH_1) ; \ fi; \ done; \ done; \ @@ -214,4 +217,4 @@ remove: rm /usr/X11R6/include/X11/pixmaps/gbootroot.xpm rm -rf /usr/share/doc/gbootroot -.PHONY: tools sources genext2fs root_fs_helper \ No newline at end of file +.PHONY: tools sources genext2fs root_fs_helper diff --git a/gbootroot_pkg b/gbootroot_pkg index d3da179..c616642 100755 --- a/gbootroot_pkg +++ b/gbootroot_pkg @@ -65,7 +65,7 @@ my $gbootroot_cvs = "$user_home/gbootroot/gbootroot"; my $gbootroot_cvs_rep = "$gbootroot_cvs/yard/replacements"; my $packaging_place = "$user_home/gbootroot/PACKAGING"; my $packaging_place_orig = $packaging_place; -my $packaging_defaults = "$gbootroot_cvs/pkg/dpkg"; +my $packaging_defaults = "$gbootroot_cvs/pkg/dpkg/gbootroot"; my $email = "freesource\@users.sourceforge.net"; my $name = "Jonathan Rosenbaum"; my $makefile = "Makefile.pkg"; @@ -356,6 +356,8 @@ if ( $ARGV[0] eq "both" || $ARGV[0] eq "rpm" ) { # a source package specific to rpm is made more than once. my $source = dirname($packaging_place) . "/" . $prog . "-" . $version; + chdir($packaging_place); + system "make clean-sources"; foreach my $package ( @rpm_packages ) { open (RPM_PLACE, "$rpm_packaging_place/$package" ) or diff --git a/pkg/dpkg/gbootroot-nest1/control b/pkg/dpkg/gbootroot-nest1/control index c00c3f7..a72747a 100644 --- a/pkg/dpkg/gbootroot-nest1/control +++ b/pkg/dpkg/gbootroot-nest1/control @@ -26,5 +26,7 @@ Description: Boot/Root Filesystem Distribution testing and creation. . See manual in /usr/share/doc/gbootroot-nest1/html for instructions on how to add the proper lines to your sources.list. Both binary and source - packages are available. + packages are available. This package should be installed under a Debian + root_fs; make_debian or the make_debian_x11 script from make-debian-x11 + can be used to make Debian root_fs. diff --git a/pkg/dpkg/gbootroot-nest1/rules b/pkg/dpkg/gbootroot-nest1/rules index 6661af4..6855791 100755 --- a/pkg/dpkg/gbootroot-nest1/rules +++ b/pkg/dpkg/gbootroot-nest1/rules @@ -20,7 +20,7 @@ build-stamp: dh_testdir # Add here commands to compile the package. - $(MAKE) + $(MAKE) KCONFIG_FILE=config-nest1 #/usr/bin/docbook-to-man debian/gbootroot.sgml > gbootroot.1 touch build-stamp