summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-11-24 18:57:42 +0000
committerV3n3RiX <venerix@rogentos.ro>2016-11-24 18:57:42 +0000
commit6fd9d116390786f59a05c20e0ca2980bd90f9ea6 (patch)
treea7f40851e3a2c9b7986469bc6c88b78e80655cf7
parent97b2fa4f5411ec5437a35a398927d19f6ef320d8 (diff)
we no longer need to patch calamares dracut module, hurray
-rw-r--r--app-admin/calamares/calamares-2.4.3-r4.ebuild (renamed from app-admin/calamares/calamares-2.4.3-r3.ebuild)2
-rw-r--r--app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch12
2 files changed, 0 insertions, 14 deletions
diff --git a/app-admin/calamares/calamares-2.4.3-r3.ebuild b/app-admin/calamares/calamares-2.4.3-r4.ebuild
index eb7ca13d..21944989 100644
--- a/app-admin/calamares/calamares-2.4.3-r3.ebuild
+++ b/app-admin/calamares/calamares-2.4.3-r4.ebuild
@@ -49,8 +49,6 @@ DEPEND="
RDEPEND=">=app-misc/calamares-runtime-1.0[branding]"
src_prepare() {
- # patch dracut module to be called the way we want it, until the module becomes configurable
- epatch ${FILESDIR}/${P}-dracut-redcore.patch
# replace calamares installer desktop icon
sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop"
# fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY)
diff --git a/app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch b/app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch
deleted file mode 100644
index 376b1a46..00000000
--- a/app-admin/calamares/files/calamares-2.4.3-dracut-redcore.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur a/src/modules/dracut/main.py b/src/modules/dracut/main.py
---- a/src/modules/dracut/main.py 2016-04-12 10:23:47.000000000 +0100
-+++ b/src/modules/dracut/main.py 2016-08-06 13:21:38.055554294 +0100
-@@ -28,7 +28,7 @@
-
- :return:
- """
-- return target_env_call(['dracut', '-f'])
-+ return target_env_call(['dracut', '-H', '-f', '-o', 'systemd', '-o', 'systemd-initrd', '-o', 'systemd-networkd', '-o', 'dracut-systemd', '--kver', '4.8.5-redcore', '/boot/initramfs-genkernel-x86_64-4.8.5-redcore'])
-
-
- def run():