sync with master

Merge branch 'master' into kernel-4.4

kernel/kernel/actions.py

@@ -34,18 +34,27 @@ def install():
 
     # Generate some module lists to use within mkinitramfs
     shelltools.system("./generate-module-list %s/lib/modules/%s" % (get.installDIR(), kerneltools.__getSuffix()))
-
-
+    
+    
+    
     #mkinitcpio default config
     pisitools.dodir("/etc/mkinitcpio.d")
     shelltools.touch("linux.preset")
+    
 
-    shelltools.echo("linux.preset", 'ALL_config="/etc/mkinitcpio.conf"\n'+
-
-                    'ALL_kver="/boot/kernel-%s"\n'% get.srcVERSION() +
+    shelltools.echo("linux.preset", "# mkinitcpio preset file for the 'linux' package\n" +
+                    
+                    'ALL_config="/etc/mkinitcpio.conf"\n'+
+                    
+                    'ALL_kver="/boot/kernel-%s"\n\n'% get.srcVERSION() +
+                    "PRESETS=('default' 'fallback') \n\n" +
+                    '#default_config="/etc/mkinitcpio.conf"\n' +
 
                     'default_image="/boot/initramfs-%s.img"\n'% get.srcVERSION() +
-
-                    'default_options="-S autodetect"\n')
-
+                    
+                    '#default_options=""\n\n' +
+                    '#fallback_config="/etc/mkinitcpio.conf"\n'+
+                    'fallback_image="/boot/initramfs-%s-fallback.img"\n'% get.srcVERSION() +
+                    'fallback_options="-S autodetect"\n')
+    
     pisitools.insinto("/etc/mkinitcpio.d", "linux.preset")

kernel/kernel/pspec.xml

@@ -1,4 +1,3 @@
-
 <?xml version="1.0" ?>
 <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
@@ -169,7 +168,6 @@
         <Name>kernel</Name>
         <RuntimeDependencies>
             <Dependency>pisi</Dependency>
-            <Dependency>mkinitramfs</Dependency>
             <Dependency>linux-firmware</Dependency>
             <Dependency>grub2</Dependency>
         </RuntimeDependencies>
@@ -217,7 +215,7 @@
     </Package>
 
     <History>
-           <Update release="2">
+        <Update release="2">
             <Date>2016-04-27</Date>
             <Version>4.4.8</Version>
             <Comment>Version Bump.</Comment>
@@ -227,8 +225,8 @@
             </Requires>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-           </Update>
-           <Update release="1">
+        </Update>
+        <Update release="1">
             <Date>2016-03-06</Date>
             <Version>4.4.4</Version>
             <Comment>First release</Comment>
@@ -238,6 +236,6 @@
             </Requires>
             <Name>Ertuğrul Erata</Name>
             <Email>ertugrulerata@gmail.com</Email>
-          </Update>
+        </Update>
     </History>
 </PISI>