Merge branch 'master' into debian

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..875955a
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,43 @@
+2011-09-23 13:27:44 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Release a new version with a ChangeLog file (HEAD, v0.1a, master)
+
+2011-09-23 13:14:41 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Makefile: add a rule to generate a GNU style ChangeLog
+
+2011-09-23 12:06:40 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * README: adjust wording and add links to kboot.conf format
+
+2011-09-22 13:03:09 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Remove the debian/ dir from the master branch (v0.1, origin/master, origin/HEAD)
+
+2011-09-13 15:16:38 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Add an alternative way to find the root device
+
+2011-09-13 12:57:43 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Fix a typo: the 10_linux we ispire from is from grub
+
+2011-09-13 12:56:26 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Put "set -e" after the license header
+
+2011-09-13 12:01:55 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Cleanup debian/postinst and debian/postrm scripts
+
+2011-09-13 11:19:02 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * No need to be a native debian package
+
+2011-04-15 21:39:42 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Handle the case when links like /dev/root are returned
+
+2011-04-14 23:43:58 +0200  Antonio Ospite  <ospite@studenti.unina.it>
+
+       * Initial import

diff --git a/Makefile b/Makefile
index 8529cb3..66607ac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,3 +9,6 @@ install:
        install -m 0644 kboot-mkconfig_lib $(DESTDIR)$(PREFIX)/lib/kboot/kboot-mkconfig_lib
        install -m 0755 kboot-mkconfig $(DESTDIR)$(PREFIX)/sbin/kboot-mkconfig
        install -m 0644 default.kboot $(DESTDIR)$(SYSCONFDIR)/default/kboot
+
+changelog:
+       git log --pretty="format:%ai  %aN  <%aE>%n%n%x09* %s%d%n" > ChangeLog

diff --git a/README b/README
index 0977b6b..203c4e7 100644 (file)
--- a/README
+++ b/README
@@ -1,5 +1,11 @@
-Helper tools to automatically generate a kboot.conf from entries in /boot
+kboot-utils provides helper tools to automatically generate a kboot.conf file 
+from entries in /boot.
 
-The kboot.conf file can be read by the petitboot  bootloader which is used for 
-instance on the Sony Playstation 3 in OtherOS mode in order to list kernels to 
-boot.
+kboot.conf is used for instance by the petitboot bootloader, which is used on 
+the Sony PlayStation 3 in OtherOS mode; petitboot reads the file from the root 
+filesystem in order to list kernels to boot.
+
+A description of the kboot.conf file format can be found at:
+http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-linux-docs/ps3-linux-docs-latest/mini-boot-conf.txt
+mirrored at:
+http://ring.nict.go.jp/pub/linux/kernel.org/kernel/people/geoff/cell/ps3-linux-docs/ps3-linux-docs-latest/mini-boot-conf.txt

diff --git a/kboot-mkconfig b/kboot-mkconfig
index 5601749..7a68a5e 100755 (executable)
--- a/kboot-mkconfig
+++ b/kboot-mkconfig
@@ -20,7 +20,7 @@
 set -e
 
 PACKAGE_NAME=kboot-mkconfig
-PACKAGE_VERSION=0.1
+PACKAGE_VERSION=0.1a
 
 prefix=/usr
 exec_prefix=${prefix}