[Pkg-mol-commits] r110 - mol/trunk/debian
Gaudenz Steinlin
gaudenz at costa.debian.org
Sat Oct 7 14:14:47 UTC 2006
Author: gaudenz
Date: 2006-10-07 14:14:46 +0000 (Sat, 07 Oct 2006)
New Revision: 110
Added:
mol/trunk/debian/Makefile.mol-source
mol/trunk/debian/debian.mol-source/
mol/trunk/debian/mol-source.README.Debian
mol/trunk/debian/mol-source.dirs
mol/trunk/debian/mol-source.postinst
Removed:
mol/trunk/debian/Makefile.mol-modules-source
mol/trunk/debian/debian.mol-modules-source/
mol/trunk/debian/mol-modules-source.README.Debian
mol/trunk/debian/mol-modules-source.dirs
mol/trunk/debian/mol-modules-source.postinst
Modified:
mol/trunk/debian/changelog
mol/trunk/debian/control
mol/trunk/debian/rules
Log:
rename mol-modules-source to mol-source for linux-modules-extra-2.6
Deleted: mol/trunk/debian/Makefile.mol-modules-source
===================================================================
--- mol/trunk/debian/Makefile.mol-modules-source 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/Makefile.mol-modules-source 2006-10-07 14:14:46 UTC (rev 110)
@@ -1,49 +0,0 @@
-#
-# Makefile for mol-modules-source, top-level
-#
-
-# build the Mac-on-Linux kernel modules from an incomplete source tree
-
-# written by Jens Schmalzing <jensen at debian.org> for the Debian
-# package mol-modules-source to allow users to build modules for
-# custom kernels, while using a binary package for the rest of the
-# emulator.
-#
-# rewritten by Gaudenz Steinlin <gaudenz at debian.org> for the changed
-# mol build system.
-
-# Sun, 19 Oct 2003
-
-# define a few variables, in case they are not already set by
-# make-kpkg or a higher-level Makefile
-
-KVERS ?= `uname -r`
-KSRC ?= /lib/modules/$(KVERS)/build
-export KVERS KSRC
-
-# module source directories
-SUBDIRS = kmod netdriver
-
-# build sheep driver by default as module
-BUILD_SHEEP = m
-export BUILD_SHEEP
-
-# descend into subdirectories and build modules
-.PHONY: $(SUBDIRS)
-build: $(SUBDIRS)
-$(SUBDIRS):
- -$(MAKE) -C $(KSRC) M=`pwd`/$@
-
-# descend into subdirectories and install the modules
-.PHONY: $(SUBDIRS:=-install)
-install: build $(SUBDIRS:=-install)
-$(SUBDIRS:=-install):
- -$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
-
-# descend into subdirectories and clean up
-.PHONY: $(SUBDIRS:=-clean)
-clean: $(SUBDIRS:=-clean)
-$(SUBDIRS:=-clean):
- $(MAKE) -C $(KSRC) M=`pwd`/$(subst -clean,,$@) clean
-
-
Copied: mol/trunk/debian/Makefile.mol-source (from rev 71, mol/trunk/debian/Makefile.mol-modules-source)
===================================================================
--- mol/trunk/debian/Makefile.mol-source (rev 0)
+++ mol/trunk/debian/Makefile.mol-source 2006-10-07 14:14:46 UTC (rev 110)
@@ -0,0 +1,49 @@
+#
+# Makefile for mol-modules-source, top-level
+#
+
+# build the Mac-on-Linux kernel modules from an incomplete source tree
+
+# written by Jens Schmalzing <jensen at debian.org> for the Debian
+# package mol-modules-source to allow users to build modules for
+# custom kernels, while using a binary package for the rest of the
+# emulator.
+#
+# rewritten by Gaudenz Steinlin <gaudenz at debian.org> for the changed
+# mol build system.
+
+# Sun, 19 Oct 2003
+
+# define a few variables, in case they are not already set by
+# make-kpkg or a higher-level Makefile
+
+KVERS ?= `uname -r`
+KSRC ?= /lib/modules/$(KVERS)/build
+export KVERS KSRC
+
+# module source directories
+SUBDIRS = kmod netdriver
+
+# build sheep driver by default as module
+BUILD_SHEEP = m
+export BUILD_SHEEP
+
+# descend into subdirectories and build modules
+.PHONY: $(SUBDIRS)
+build: $(SUBDIRS)
+$(SUBDIRS):
+ -$(MAKE) -C $(KSRC) M=`pwd`/$@
+
+# descend into subdirectories and install the modules
+.PHONY: $(SUBDIRS:=-install)
+install: build $(SUBDIRS:=-install)
+$(SUBDIRS:=-install):
+ -$(MAKE) INSTALL_MOD_PATH=$(DESTDIR) -C $(KSRC) M=`pwd`/$(subst -install,,$@) modules_install
+
+# descend into subdirectories and clean up
+.PHONY: $(SUBDIRS:=-clean)
+clean: $(SUBDIRS:=-clean)
+$(SUBDIRS:=-clean):
+ $(MAKE) -C $(KSRC) M=`pwd`/$(subst -clean,,$@) clean
+
+
Modified: mol/trunk/debian/changelog
===================================================================
--- mol/trunk/debian/changelog 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/changelog 2006-10-07 14:14:46 UTC (rev 110)
@@ -1,3 +1,10 @@
+mol (0.9.71.dfsg-2) UNRELEASED; urgency=low
+
+ * NOT RELEASED YET
+ * rename mol-modules-source to mol-source for linux-modules-extra-2.6
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Sat, 7 Oct 2006 16:11:13 +0200
+
mol (0.9.71.dfsg-1) unstable; urgency=low
* the "let's make it lintian clean" release
Modified: mol/trunk/debian/control
===================================================================
--- mol/trunk/debian/control 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/control 2006-10-07 14:14:46 UTC (rev 110)
@@ -26,11 +26,13 @@
run on the virtual machine. At the time of this writing, there are
driver packages for Linux, Mac OS 9 and earlier, and Mac OS X.
-Package: mol-modules-source
+Package: mol-source
Architecture: any
Depends: gcc, libc6-dev, make
Recommends: debhelper, kernel-package, m4
Suggests: linux-headers | linux-source
+Replaces: mol-modules-source
+Conflicts: mol-modules-source (<< 0.9.71.dfsg-1)
Description: The Mac-on-Linux emulator - source for kernel modules
.
Mac-on-Linux is basically an emulator capable of running
@@ -45,3 +47,10 @@
modules, you need the header files for your kernel.
Probably the easiest way of obtaining them is to install
the appropriate kernel-headers or kernel-source package.
+
+Package: mol-modules-source
+Architecture: all
+Depends: mol-source
+Description: transitional dummy package
+ This package smooths upgrades from older versions of mol-modules-source
+
Copied: mol/trunk/debian/debian.mol-source (from rev 71, mol/trunk/debian/debian.mol-modules-source)
Deleted: mol/trunk/debian/mol-modules-source.README.Debian
===================================================================
--- mol/trunk/debian/mol-modules-source.README.Debian 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/mol-modules-source.README.Debian 2006-10-07 14:14:46 UTC (rev 110)
@@ -1,48 +0,0 @@
-mol-modules-source for Debian
------------------------------
-
-This package provides the source code for the Mac-on-Linux kernel
-modules. In order to use them for running the Mac-on-Linux emulator
-mol, you have to compile and install them. The Debian way of doing
-this is to use the modules_image target of kernel-package.
-
-* Unpacking the source
-
- The source code is provided as a gzipped tar archive. If you intend
- to build the modules with make or with make-kpkg, you will need to
- unpack it. Simply change to the directory /usr/src and issuing the
- command `tar zxvf mol-modules.tar.gz'.
-
-* Compiling the modules with make
-
- Change to the modules source directory /usr/src/modules/mol and
- issue the command `make install' to build and install the sheep_net
- and mol modules. The variables KVERS and KSRC contain the version
- number of your kernel and the location of your kernel source tree,
- respectively. Unless they are set by the environment or via the
- commandline, the top level Makefile assigns reasonable defaults.
-
-* Compiling the modules with kernel-package
-
- Change to your kernel source directory and issue the command
- `make-kpkg modules_image'. This will produce a mol-modules-<your
- kernel version> package which you can install with `dpkg -i'. If
- you want to distribute this package, you should probably use the
- command `make-kpkg modules' instead. In addition to building the
- package, this also creates a .changes file which you can sign with
- the debsign command.
-
-* A note on kernel headers and kernel build system
-
- Whichever of the above methods you choose, building the modules
- requires kernel headers and the kernel build system. There is
- no need to worry about this if you are using make-kpkg, because
- they simply use the header files from the kernel source. When
- compiling the modules manually with make, it is probably easiest
- to use the headers from the appropriate linux-headers package.
- For that reason, the Makefiles expect the headers in the directory
- /lib/modules/<your kernel version>-<flavour>/build which usually
- is a symlink to the kernel headers. If you keep your kernel headers
- in a different place, you need to set the KSRC variable.
-
- -- Gaudenz Steinlin <gaudenz at debian.org> 02 Oct 2006
Deleted: mol/trunk/debian/mol-modules-source.dirs
===================================================================
--- mol/trunk/debian/mol-modules-source.dirs 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/mol-modules-source.dirs 2006-10-07 14:14:46 UTC (rev 110)
@@ -1 +0,0 @@
-usr/src
Deleted: mol/trunk/debian/mol-modules-source.postinst
===================================================================
--- mol/trunk/debian/mol-modules-source.postinst 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/mol-modules-source.postinst 2006-10-07 14:14:46 UTC (rev 110)
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-# Debian Mac-on-Linux postinst script
-# written by Jens Schmalzing <jensen at debian.org>
-
-# use scripts generated by debhelper
-#DEBHELPER#
Copied: mol/trunk/debian/mol-source.README.Debian (from rev 71, mol/trunk/debian/mol-modules-source.README.Debian)
===================================================================
--- mol/trunk/debian/mol-source.README.Debian (rev 0)
+++ mol/trunk/debian/mol-source.README.Debian 2006-10-07 14:14:46 UTC (rev 110)
@@ -0,0 +1,48 @@
+mol-source for Debian
+-----------------------------
+
+This package provides the source code for the Mac-on-Linux kernel
+modules. In order to use them for running the Mac-on-Linux emulator
+mol, you have to compile and install them. The Debian way of doing
+this is to use the modules_image target of kernel-package.
+
+* Unpacking the source
+
+ The source code is provided as a gzipped tar archive. If you intend
+ to build the modules with make or with make-kpkg, you will need to
+ unpack it. Simply change to the directory /usr/src and issuing the
+ command `tar jxvf mol.tar.bz2'.
+
+* Compiling the modules with make
+
+ Change to the modules source directory /usr/src/modules/mol and
+ issue the command `make install' to build and install the sheep_net
+ and mol modules. The variables KVERS and KSRC contain the version
+ number of your kernel and the location of your kernel source tree,
+ respectively. Unless they are set by the environment or via the
+ commandline, the top level Makefile assigns reasonable defaults.
+
+* Compiling the modules with kernel-package
+
+ Change to your kernel source directory and issue the command
+ `make-kpkg modules_image'. This will produce a mol-modules-<your
+ kernel version> package which you can install with `dpkg -i'. If
+ you want to distribute this package, you should probably use the
+ command `make-kpkg modules' instead. In addition to building the
+ package, this also creates a .changes file which you can sign with
+ the debsign command.
+
+* A note on kernel headers and kernel build system
+
+ Whichever of the above methods you choose, building the modules
+ requires kernel headers and the kernel build system. There is
+ no need to worry about this if you are using make-kpkg, because
+ they simply use the header files from the kernel source. When
+ compiling the modules manually with make, it is probably easiest
+ to use the headers from the appropriate linux-headers package.
+ For that reason, the Makefiles expect the headers in the directory
+ /lib/modules/<your kernel version>-<flavour>/build which usually
+ is a symlink to the kernel headers. If you keep your kernel headers
+ in a different place, you need to set the KSRC variable.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> 02 Oct 2006
Copied: mol/trunk/debian/mol-source.dirs (from rev 71, mol/trunk/debian/mol-modules-source.dirs)
===================================================================
--- mol/trunk/debian/mol-source.dirs (rev 0)
+++ mol/trunk/debian/mol-source.dirs 2006-10-07 14:14:46 UTC (rev 110)
@@ -0,0 +1 @@
+usr/src
Copied: mol/trunk/debian/mol-source.postinst (from rev 71, mol/trunk/debian/mol-modules-source.postinst)
===================================================================
--- mol/trunk/debian/mol-source.postinst (rev 0)
+++ mol/trunk/debian/mol-source.postinst 2006-10-07 14:14:46 UTC (rev 110)
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+# Debian Mac-on-Linux postinst script
+# written by Jens Schmalzing <jensen at debian.org>
+
+# use scripts generated by debhelper
+#DEBHELPER#
Modified: mol/trunk/debian/rules
===================================================================
--- mol/trunk/debian/rules 2006-10-07 14:10:47 UTC (rev 109)
+++ mol/trunk/debian/rules 2006-10-07 14:14:46 UTC (rev 110)
@@ -68,7 +68,7 @@
# remove the modules source directory and tarball
rm -rf modules
- rm -f mol-modules.tar.bz2
+ rm -f mol.tar.bz2
dh_clean debian/tmp
@@ -96,16 +96,16 @@
# extract a 32x32 XPM menu logo from the raw boot logo
convert -depth 8 -size 100x122 -frame 14x3 -mattecolor '#ffffce' -scale 25% rgb:`pwd`/mollib/graphics/bootlogo.raw `pwd`/debian/mol/usr/share/pixmaps/mol.xpm
-# put together the mol-modules-source package by copying the relevant code
+# put together the mol-source package by copying the relevant code
mkdir -p modules/mol/kmod modules/mol/netdriver
-cp -L obj-ppc/build/src/kmod/* modules/mol/kmod
-cp -L obj-ppc/build/src/netdriver/* modules/mol/netdriver
# add the Debian directory and the top-level Makefile
- cp -pr debian/debian.mol-modules-source modules/mol/debian
+ cp -pr debian/debian.mol-source modules/mol/debian
m4 -DMOL_VERSION=$(VERSION) < modules/mol/debian/changelog.m4.m4 > modules/mol/debian/changelog.m4
rm modules/mol/debian/changelog.m4.m4
- cp -p debian/Makefile.mol-modules-source modules/mol/Makefile
+ cp -p debian/Makefile.mol-source modules/mol/Makefile
# set correct permissions
chmod u+x modules/mol/debian/rules
@@ -113,10 +113,10 @@
chmod -R u+w,go-w,a+rX modules
# create a tarball
- tar jcf mol-modules.tar.bz2 modules
+ tar jcf mol.tar.bz2 modules
-# install the source tarball into mol-modules-source
- install -o root -g root -m 644 mol-modules.tar.bz2 `pwd`/debian/mol-modules-source/usr/src
+# install the source tarball into mol-source
+ install -o root -g root -m 644 mol.tar.bz2 `pwd`/debian/mol-source/usr/src
# create the mol-modules packages by moving the installed modules
# dh_movefiles --sourcedir=debian/mol
More information about the Pkg-mol-commits
mailing list