[weasel-commit] Source: kernelpackage=0.0.0-56.17

From: rbuilder@xxxxxxxxx
To: weasel-commit@xxxxxxxxxxxxx
Date: Fri, 18 Jun 2010 13:07:56 -0400
================================
kernelpackage:source=0.0.0-56.17 (previous: 0.0.0-56.16)
cvc rdiff kernelpackage -1 
/kernelbits.rpath.org@rpl:2//weasel.rpath.org@wgl:3-devel/0.0.0-56.17
================================
0.0.0-56.17 Filip Brcic (brcha@xxxxxxxxxxxx) Fri Jun 18 13:07:41 2010
    porting to mkinitcpio

kernelpackage.recipe: changed
Index: kernelpackage.recipe
====================================================================
contents(size sha1)
inode(mtime)
--- kernelpackage.recipe 
/kernelbits.rpath.org@rpl:2//weasel.rpath.org@wgl:3-devel/0.0.0-56.16
+++ kernelpackage.recipe 
/kernelbits.rpath.org@rpl:2//weasel.rpath.org@wgl:3-devel/0.0.0-56.17
@@ -10,7 +10,7 @@
     buildRequires = [
        'perl:runtime', 'module-init-tools:runtime', 'ncurses:devel',
        'gettext:runtime', 'intltool:runtime', 'perl:devel',
-       'python:devel'
+       'python:devel', 'mkinitcpio:runtime',
        ]
 
     abstractBaseClass = True
@@ -130,6 +130,7 @@
         r.buildAtaModuleMap() # may be overridden if modules.libata not needed
         r.removeDuplicateFirmware() # /lib/firmware conflicts RPL-3012
         r.build() # extra build actions go here
+        r.createMkinitcpioPreset()
         r.policyBase()
         r.policy() # extra policy goes here
 
@@ -302,8 +303,8 @@
         r.ComponentSpec('build-tree', '/lib/modules/[^/]*/build/')
         r.ComponentSpec('debuginfo', '%(debugsrcdir)s/', '%(debuglibdir)s/')
         r.ComponentSpec('runtime', '.*')
-        # do not depend on mkinitrd's kernel tagdescription file
-        r.TagSpec('kernel', '/boot/vmlinuz-.*', '/lib/modules/.*/.*\.k?o$')
+        # # do not depend on mkinitrd's kernel tagdescription file
+        # r.TagSpec('kernel', '/boot/vmlinuz-.*', '/lib/modules/.*/.*\.k?o$')
         if Arch.x86:
             r.Provides('abi: ELF32(SysV x86)', '/boot/vmlinu.*')
         if Arch.x86_64:
@@ -339,6 +340,36 @@
         r.ComponentSpec('vmware', '/lib/modules/%(kver)s/kernel/fs/vm.*')
         r.ComponentSpec('vmware', 
'/lib/modules/%(kver)s/kernel/drivers/misc/v.*')
         r.ComponentSpec('vmware', 
'/lib/modules/%(kver)s/kernel/drivers/net/vm.*')
+
+    def createMkinitcpioPreset(r):
+        r.Create('%(sysconfdir)s/mkinitcpio.d/initcpio-%(kver)s.preset', 
contents="""
+# Example mkinitcpio preset file
+
+# preset names
+PRESETS=('default' 'fallback')
+
+# ALL_kver is used if presetname_kver is not set
+# note for distribution kernels: this should be in a separate file
+# and read like this:
+# . /etc/mkinitcpio.d/exmaple.kver
+ALL_kver='%(kver)s'
+ALL_config='/etc/mkinitcpio.conf'
+
+# presetname_kver    - the kernel version (omit if ALL_kver should be used)
+# presetname_config  - the configuration file (omit if ALL_config should be 
used)
+# presetname_image   - the filename of generated image
+# presetname_options - any extra options
+
+#default_kver="2.6.18-ARCH"
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initcpio-%(kver)s.img"
+default_options=""
+
+#fallback_kver="2.6.18-ARCH"
+#fallback_config="/etc/mkinitcpio.conf"
+fallback_image="/boot/initcpio-%(kver)s-fallback.img"
+fallback_options="-S autodetect"
+""")
 
     def policyBase(r):
         # Disable Autodoc. Users tend to have more than 1 kernel installed
@@ -350,8 +381,8 @@
         r.Provides(exceptions=r'/lib/modules/%(kver)s/.*\.ko$')
         r.Provides('soname: libkconfig.so',
                    '/lib/modules/.*/build/scripts/kconfig/libkconfig.so')
-        # r.Requires('mkinitrd:runtime',
-        #            r'/lib/modules/%(kver)s/.*\.ko$')
+        r.Requires('mkinitcpio:runtime',
+                   r'/lib/modules/%(kver)s/.*\.ko$')
         r.ComponentProvides(('%(kver)s', '%(gccver)s'))
 
     def policy(r):



Committed by: brcha
[weasel-commit] Source: kernelpackage=0.0.0-56.17

Other related posts:
