Changeset 1903 in MondoRescue for branches/stable/pbconf

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

Location:

branches/stable/pbconf

Files:

• mindi-busybox/ebuild/mindi-busybox.ebuild (modified) (1 diff)
• mindi/rpm/mindi.spec (modified) (1 diff)
• mondo-doc/du/mondo-doc.doc-base (modified) (1 diff)
• mondo/ebuild/mondo-rescue.ebuild (modified) (1 diff)
• mondorescue.pb (modified) (2 diffs)

branches/stable/pbconf/mindi-busybox/ebuild/mindi-busybox.ebuild

@@ -28 +28 @@
 src_install() {
     # bundle up the symlink files for use later
-    emake PREFIX="${D}/usr/lib/mindi/rootfs" install || die
+    emake CONFIG_PREFIX="${D}/usr/lib/mindi/rootfs" install || die
 }

branches/stable/pbconf/mindi/rpm/mindi.spec

@@ -50 +50 @@
 %defattr(-,root,root)
 %config(noreplace) %{_sysconfdir}/%{name}
-%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox README.proliant README.bkphw NEWS 
+%doc ChangeLog INSTALL COPYING README TODO README.* NEWS 
 #svn.log
 %{_mandir}/man8/*

branches/stable/pbconf/mondo-doc/du/mondo-doc.doc-base

@@ -6 +6 @@
  effortlessly backup and interactively restore Linux, Windows and other
  supported filesystem partitions to/from CD-R/RW media, tape, NFS, ... and
- Mindi Linux provides the bootable emergency restore CD/floppy set which Mondo
+ Mindi Linux provides the bootable emergency restore media set which Mondo
  uses at boot-time.
 Section: PBGRP

branches/stable/pbconf/mondo/ebuild/mondo-rescue.ebuild

@@ -23 +23 @@
     sys-devel/binutils
     >=app-arch/bzip2-0.9
-    app-cdr/cdrtools
-    >=sys-apps/mindi-1.2.4
+    virtual/cdrtools
+    >=sys-apps/mindi-2.0.0
     >=dev-libs/newt-0.50
     >=sys-libs/slang-1.4.1
+    sys-apps/parted
     >=sys-boot/syslinux-1.52"
 

branches/stable/pbconf/mondorescue.pb

@@ -17 +17 @@
 # Packager label
 #
-pbpackager mondorescue = "Bruno Cornec <bruno@mondorescue.org>"
+packager mondorescue = Bruno Cornec <bruno@mondorescue.org>
 
 #
@@ -79 +79 @@
 extpkgdir mindi-busybox = mindi-busybox
 extpkgdir mondo-doc = mondo-doc
+# Gentoo doesn't name the package mondo as it conflicts
+# So we create an additional fake package just for it
+extpkgdir mondo-rescue = mondo
 
 # Hash of valid version names