Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/core

Browse Source
This commit is contained in:
Ertuğrul Erata
2016-04-30 09:47:06 +03:00
parent f6c0bda49f 47d6f3975b
commit 705dfde2da
9 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kernel/actions.py
+10 -3
View File
@@ -42,12 +42,19 @@ def install():
shelltools.touch("linux.preset")
shelltools.echo("linux.preset", 'ALL_config="/etc/mkinitcpio.conf"\n'+
shelltools.echo("linux.preset", "# mkinitcpio preset file for the 'linux' package\n" +
'ALL_kver="/boot/kernel-%s"\n'% get.srcVERSION() +
'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
View File
@@ -190,7 +190,6 @@
<Name>kernel</Name>
<RuntimeDependencies>
<Dependency>pisi</Dependency>
<Dependency>mkinitramfs</Dependency>
<Dependency>linux-firmware</Dependency>
<Dependency>grub2</Dependency>
</RuntimeDependencies>
kernel/tools/mkinitcpio/pspec.xml
+7
View File
@@ -30,8 +30,15 @@
<Dependency>libarchive</Dependency>
<Dependency>kmod</Dependency>
<Dependency>libkmod</Dependency>
<Dependency>kernel</Dependency>
<Dependency>busybox-mkinitcpio</Dependency>
</RuntimeDependencies>
<Replaces>
<Package>mkinitramfs</Package>
</Replaces>
<Conflicts>
<Package>mkinitramfs</Package>
</Conflicts>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="library">/usr/lib</Path>
pisi-index.xml
+8 -1
View File
@@ -672,7 +672,6 @@
</BuildFlags>
<RuntimeDependencies>
<Dependency>pisi</Dependency>
<Dependency>mkinitramfs</Dependency>
<Dependency>linux-firmware</Dependency>
<Dependency>grub2</Dependency>
</RuntimeDependencies>
@@ -896,6 +895,7 @@
<Dependency>libarchive</Dependency>
<Dependency>kmod</Dependency>
<Dependency>libkmod</Dependency>
<Dependency>kernel</Dependency>
<Dependency>busybox-mkinitcpio</Dependency>
</RuntimeDependencies>
<Files>
@@ -905,6 +905,12 @@
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="data">/etc</Path>
</Files>
<Conflicts>
<Package>mkinitramfs</Package>
</Conflicts>
<Replaces>
<Package>mkinitramfs</Package>
</Replaces>
<Provides>
<COMAR script="pakhandler.py">System.PackageHandler</COMAR>
</Provides>
@@ -3201,6 +3207,7 @@
<Name>help2man</Name>
<RuntimeDependencies>
<Dependency>perl-Locale-gettext</Dependency>
<Dependency>mkinitcpio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
c4d70eeef83b5558209f2c21ff6ae3614f9caf31
24921e123be3893253577838e04ae80c1a6dbaad
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
c0586bff5d0ad05098ca3f6708a614aa51acfb5f
4d880ba8e74a5454d8422d688467c99639dd5ee4
system/base/help2man/pspec.xml
+1
View File
@@ -25,6 +25,7 @@
<Name>help2man</Name>
<RuntimeDependencies>
<Dependency>perl-Locale-gettext</Dependency>
<Dependency>mkinitcpio</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
system/boot/grub2/files/pisi_name_and_initramfs.patch
+7 -5
View File
@@ -1,5 +1,5 @@
--- grub-2.00/util/grub.d/10_linux.in~ 2012-04-18 23:24:38.000000000 +0200
+++ grub-2.00/util/grub.d/10_linux.in 2012-11-28 22:27:41.652673833 +0100
--- grub-2.02~beta2.orig/util/grub.d/10_linux.in 2013-12-24 18:45:34.000000000 +0200
+++ grub-2.02~beta2/util/grub.d/10_linux.in 2016-04-28 19:10:54.268739535 +0300
@@ -29,7 +29,13 @@
CLASS="--class gnu-linux --class gnu --class os"
@@ -14,11 +14,13 @@
+ fi
else
OS="${GRUB_DISTRIBUTOR} GNU/Linux"
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
@@ -193,6 +199,7 @@
CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
@@ -186,7 +192,8 @@
initrd=
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
- "initrd-${version}" "initramfs-${version}.img" \
+ "initrd-${version}" "initramfs-${version}.img" "initramfs-fallback-${version}.img"\
+ "initramfs-${version}.gz" "initramfs-${version}" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
"initrd-${alt_version}" "initramfs-${alt_version}.img" \