Djam/livecd-tools
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/livecd-tools.git synced 2025-02-24 08:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

added a one more patch

Browse source
This commit is contained in:
Alex Burmashev 2014-07-04 14:01:59 +04:00
parent 671207b0af
commit 7cd91259a0
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
livecd-tools-21.1.hack4.patch Normal file
View file

@ -0,0 +1,15 @@
diff -Nur livecd-tools-21.1.old/imgcreate/creator.py livecd-tools-21.1/imgcreate/creator.py
--- livecd-tools-21.1.old/imgcreate/creator.py 2014-07-04 13:54:51.000000000 +0400
+++ livecd-tools-21.1/imgcreate/creator.py 2014-07-04 13:58:33.879562492 +0400
@@ -583,7 +583,10 @@
packages = self.ks.handler.packages.packageList
if "basesystem" in packages:
print "Basesystem should be installed first"
- subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem'])
+ if "kernel-nrj-desktop" in packages:
+ subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem', 'kernel-nrj-desktop-latest'])
+ else:
+ subprocess.call(["/usr/sbin/urpmi", "--auto", "--split-length", "0", "--fastunsafe", "--nolock", "--ignorearch", "--no-verify-rpm", "--no-suggests", "--urpmi-root", urpmi_conf, "--root", self._instroot] + ['basesystem'])
print "Now let's install all other packages"

2
livecd-tools.spec
View file

@ -19,6 +19,7 @@ Patch2: livecd-tools-21.1.efi.fixes.patch
Patch3: livecd-tools-21.1.hack.patch
Patch4: livecd-tools-21.1.hack2.patch
Patch5: livecd-tools-21.1.hack3.patch
Patch6: livecd-tools-21.1.hack4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: python-imgcreate = %{epoch}:%{version}-%{release}
@ -73,6 +74,7 @@ like live image or appliances.
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
make