subject:"\\\[arch\\\-commits\\\] Commit in mksyslinux\\\/trunk \\\(PKGBUILD mksyslinux\\\)"

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux mksyslinux.conf)

2013-06-04 Thread Tobias Powalowski

Date: Tuesday, June 4, 2013 @ 08:46:39
  Author: tpowa
Revision: 187120

upgpkg: mksyslinux 2013.06-1

fix some paths, config files and syslinux -o

Modified:
  mksyslinux/trunk/PKGBUILD
  mksyslinux/trunk/mksyslinux
  mksyslinux/trunk/mksyslinux.conf

-+
 PKGBUILD|6 +++---
 mksyslinux  |7 ---
 mksyslinux.conf |2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-04 06:44:44 UTC (rev 187119)
+++ PKGBUILD2013-06-04 06:46:39 UTC (rev 187120)
@@ -2,7 +2,7 @@
 # Maintainer : Tobias Powalowski tp...@archlinux.org
 
 pkgname=mksyslinux
-pkgver=2013.05
+pkgver=2013.06
 pkgrel=1
 pkgdesc=Advanced, modular syslinux boot image creation utility
 arch=(any)
@@ -21,6 +21,6 @@
   install -D -m644 options.msg  $pkgdir/usr/share/mksyslinux/options.msg
 }
 md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
- 'fa5443022923fa0e2ebbbe127be621d6'
- '67e7c685e8ed30e723187b28a5e21b96'
+ '5388bd1d69b03f20bcd26d08da11bcf5'
+ '6b37cb9cb766a5f6482908c5248233c6'
  'b211c5f7e30d2ee36cde20f71aa3f2b8')

Modified: mksyslinux
===
--- mksyslinux  2013-06-04 06:44:44 UTC (rev 187119)
+++ mksyslinux  2013-06-04 06:46:39 UTC (rev 187120)
@@ -71,13 +71,14 @@
 export USEKERNEL=${VERSION}
 # begin script
 [ -e ${TEMPDIR} ]  rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}/$BOOTDIRNAME
+mkdir -p ${TEMPDIR}
 echo :: Mounting ${DEVICE} ...
 if ! [ ${IMAGENAME} =  ]; then
modprobe loop
 else
mount ${DEVICE} ${TEMPDIR} || exit 1
 fi
+mkdir -p ${TEMPDIR}/${BOOTDIRNAME}
 # prepare syslinux bootloader
 install -m755 /usr/lib/syslinux/isolinux.bin 
${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
 for i in /usr/lib/syslinux/*.c32; do
@@ -102,7 +103,7 @@
sed 
s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g
 \
${SYSLINUXCFG}  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
 fi
-[ ! -s ${TEMPDIR}/syslinux.cfg ]  echo No syslinux.cfg found  exit 1
+[ ! -s ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ]  echo No syslinux.cfg 
found  exit 1
 echo :: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ... 
 # generate initramdisk
 echo :: Creating initramdisk ...
@@ -136,7 +137,7 @@
echo :: Installing MBR on ${MBRDEVICE} ...
cat ${MBR}  ${MBRDEVICE}
echo :: Installing SYSLINUX on ${DEVICE} ...
-   syslinux -o offset ${DEVICE}  echo Installation completed.
+   syslinux -t offset ${DEVICE}  echo Installation completed.
 fi
 # clean /tmp
 rm -r ${TEMPDIR}

Modified: mksyslinux.conf
===
--- mksyslinux.conf 2013-06-04 06:44:44 UTC (rev 187119)
+++ mksyslinux.conf 2013-06-04 06:46:39 UTC (rev 187120)
@@ -19,7 +19,7 @@
 BOOTMESSAGE=/usr/share/mksyslinux/boot.msg
 OPTIONSBOOTMESSAGE=/usr/share/mksyslinux/options.msg
 
-syslinux.cfg file to use
+# syslinux.cfg file to use
 SYSLINUXCFG=
 
 # Prompt on boot, 1=yes 0=no

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux mksyslinux.conf)

2013-05-31 Thread Tobias Powalowski

Date: Friday, May 31, 2013 @ 15:27:18
  Author: tpowa
Revision: 186874

upgpkg: mksyslinux 2013.05-1

remove pcimap from script

Modified:
  mksyslinux/trunk/PKGBUILD
  mksyslinux/trunk/mksyslinux
  mksyslinux/trunk/mksyslinux.conf

-+
 PKGBUILD|   12 ++--
 mksyslinux  |1 -
 mksyslinux.conf |2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-31 13:26:58 UTC (rev 186873)
+++ PKGBUILD2013-05-31 13:27:18 UTC (rev 186874)
@@ -2,8 +2,8 @@
 # Maintainer : Tobias Powalowski tp...@archlinux.org
 
 pkgname=mksyslinux
-pkgver=2013.03
-pkgrel=2
+pkgver=2013.05
+pkgrel=1
 pkgdesc=Advanced, modular syslinux boot image creation utility
 arch=(any)
 license=('GPL')
@@ -11,10 +11,6 @@
 depends=('mkinitcpio' 'syslinux' 'pciutils')
 backup=(etc/mksyslinux.conf)
 source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
-md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
- 'cc85beaf16111b9509c52f1b360eee6f'
- '0e71d0e137ccbce67a96910278a59a40'
- 'b211c5f7e30d2ee36cde20f71aa3f2b8')
 
 package()
 {
@@ -24,3 +20,7 @@
   install -D -m644 boot.msg $pkgdir/usr/share/mksyslinux/boot.msg
   install -D -m644 options.msg  $pkgdir/usr/share/mksyslinux/options.msg
 }
+md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
+ 'fa5443022923fa0e2ebbbe127be621d6'
+ '67e7c685e8ed30e723187b28a5e21b96'
+ 'b211c5f7e30d2ee36cde20f71aa3f2b8')

Modified: mksyslinux
===
--- mksyslinux  2013-05-31 13:26:58 UTC (rev 186873)
+++ mksyslinux  2013-05-31 13:27:18 UTC (rev 186874)
@@ -83,7 +83,6 @@
 for i in /usr/lib/syslinux/*.c32; do
 install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
 done
-install -m644 /lib/modules/$(uname -r)/modules.pcimap 
${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap
 install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
 
 # create syslinux.cfg

Modified: mksyslinux.conf
===
--- mksyslinux.conf 2013-05-31 13:26:58 UTC (rev 186873)
+++ mksyslinux.conf 2013-05-31 13:27:18 UTC (rev 186874)
@@ -1,7 +1,7 @@
 # Created by Tobias Powalowski tp...@archlinux.org
 # config file of mksyslinux
 
-# DEFAULT kernel boot options like root=/dev/hda3 etc.
+# DEFAULT kernel boot options like root=/dev/sda3 etc.
 # add your root= option, if you boot from a disk device
 # and don't want to add it by hand on each boot
 KERNEL_BOOT_OPTIONS=

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux)

2010-08-26 Thread Tobias Powalowski

Date: Thursday, August 26, 2010 @ 05:33:35
  Author: tpowa
Revision: 88914

upgpkg: mksyslinux 2010.08-1
update to use /boot and /boot/syslinux directorx

Modified:
  mksyslinux/trunk/PKGBUILD
  mksyslinux/trunk/mksyslinux

+
 PKGBUILD   |9 +
 mksyslinux |   48 
 2 files changed, 33 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-26 08:37:24 UTC (rev 88913)
+++ PKGBUILD2010-08-26 09:33:35 UTC (rev 88914)
@@ -2,13 +2,13 @@
 # Maintainer : Tobias Powalowski tp...@archlinux.org
 
 pkgname=mksyslinux
-pkgver=2008.12
+pkgver=2010.08
 pkgrel=1
 pkgdesc=Advanced, modular syslinux boot image creation utility
-arch=(i686 x86_64)
+arch=(any)
 license=('GPL')
 url=http://www.archlinux.org/;
-depends=('mkinitcpio' 'syslinux')
+depends=('mkinitcpio' 'syslinux' 'pciutils')
 source=('boot.msg' 'mksyslinux' 'mksyslinux.conf' 'options.msg')
 backup=(etc/mksyslinux.conf)
 
@@ -20,7 +20,8 @@
   install -D -m644 boot.msg $startdir/pkg/usr/share/mksyslinux/boot.msg
   install -D -m644 options.msg  $startdir/pkg/usr/share/mksyslinux/options.msg
 }
+
 md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
- '3eaa9d2699a4afd28731f52855ff2272'
+ '35a9cdf3109777b45a229f1fd33f46af'
  '498997ebe6bba351bdfbaa59f5d8e523'
  'b211c5f7e30d2ee36cde20f71aa3f2b8')

Modified: mksyslinux
===
--- mksyslinux  2010-08-26 08:37:24 UTC (rev 88913)
+++ mksyslinux  2010-08-26 09:33:35 UTC (rev 88914)
@@ -5,6 +5,7 @@
 CONFIG=/etc/mksyslinux.conf
 export TEMPDIR=$(mktemp /tmp/mksyslinux.XXX)
 TMPDIR=$(mktemp -d /tmp/mksyslinux-image.XXX)
+BOOTDIRNAME=boot/syslinux
 
 usage ()
 {
@@ -60,7 +61,6 @@
 # export for mkinitcpio
 [ -n ${APPENDBOOTMESSAGE} ]  export APPENDBOOTMESSAGE
 [ -n ${APPENDBOOTMESSAGE_SYSLINUX} ]  export APPENDBOOTMESSAGE_SYSLINUX
-[ -n ${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM} ]  export 
APPENDBOOTMESSAGE_SYSLINUX_LOWMEM
 [ -n ${APPENDOPTIONSBOOTMESSAGE} ]  export APPENDOPTIONSBOOTMESSAGE
 
 MBRDEVICE=$(echo ${DEVICE} | sed -e 's/[0-9]//g')
@@ -71,29 +71,37 @@
 export USEKERNEL=${VERSION}
 # begin script
 [ -e ${TEMPDIR} ]  rm -r ${TEMPDIR}
-mkdir -p ${TEMPDIR}
+mkdir -p ${TEMPDIR}/$BOOTDIRNAME
 echo :: Mounting ${DEVICE} ...
 if ! [ ${IMAGENAME} =  ]; then
modprobe loop
 else
mount ${DEVICE} ${TEMPDIR} || exit 1
 fi
+# prepare syslinux bootloader
+install -m755 /usr/lib/syslinux/isolinux.bin 
${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin
+for i in /usr/lib/syslinux/*.c32; do
+install -m644 $i ${TEMPDIR}/${BOOTDIRNAME}/$(basename $i)
+done
+install -m644 /lib/modules/$(uname -r)/modules.pcimap 
${TEMPDIR}/${BOOTDIRNAME}/modules.pcimap
+install -m644 /usr/share/hwdata/pci.ids ${TEMPDIR}/${BOOTDIRNAME}/pci.ids
+
 # create syslinux.cfg
 echo :: Creating syslinux.cfg ...
 if [ ${SYSLINUXCFG} =  ]; then
-   [ -e ${TEMPDIR}/syslinux.cfg ]  rm ${TEMPDIR}/syslinux.cfg
-   echo prompt ${PROMPT}  ${TEMPDIR}/syslinux.cfg
-   echo timeout ${TIMEOUT}  ${TEMPDIR}/syslinux.cfg
-   echo display boot.msg  ${TEMPDIR}/syslinux.cfg
-   echo F1 boot.msg   ${TEMPDIR}/syslinux.cfg
-   echo F2 options.msg   ${TEMPDIR}/syslinux.cfg
-   echo default arch   ${TEMPDIR}/syslinux.cfg
-   echo label arch  ${TEMPDIR}/syslinux.cfg
-   echo kernel vmlinuz  ${TEMPDIR}/syslinux.cfg
-   echo append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}  
${TEMPDIR}/syslinux.cfg
+   [ -e ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg ]  rm 
${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo prompt ${PROMPT}  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo timeout ${TIMEOUT}  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo display boot.msg  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo F1 boot.msg   ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo F2 options.msg   ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo default arch   ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo label arch  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo kernel /boot/vmlinuz  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
+   echo append initrd=/boot/initrd.img ${KERNEL_BOOT_OPTIONS}  
${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
 else
sed 
s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g
 \
-   ${SYSLINUXCFG}  ${TEMPDIR}/syslinux.cfg
+   ${SYSLINUXCFG}  ${TEMPDIR}/${BOOTDIRNAME}/syslinux.cfg
 fi
 [ ! -s ${TEMPDIR}/syslinux.cfg ]  echo No syslinux.cfg found  exit 1
 echo :: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ... 
@@ -101,11 +109,11 @@
 echo :: Creating initramdisk ...
mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g 
${TEMPDIR}/initrd.img
 echo :: Using ${KERNEL} as image kernel ...
-   install -m644 ${KERNEL} ${TEMPDIR}/vmlinuz
-   install -m644

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux)

2010-08-26 Thread Tobias Powalowski

Date: Thursday, August 26, 2010 @ 06:02:24
  Author: tpowa
Revision: 88917

upgpkg: mksyslinux 2010.08-1
fixed typo

Modified:
  mksyslinux/trunk/PKGBUILD
  mksyslinux/trunk/mksyslinux

+
 PKGBUILD   |3 +--
 mksyslinux |2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-26 09:33:58 UTC (rev 88916)
+++ PKGBUILD2010-08-26 10:02:24 UTC (rev 88917)
@@ -20,8 +20,7 @@
   install -D -m644 boot.msg $startdir/pkg/usr/share/mksyslinux/boot.msg
   install -D -m644 options.msg  $startdir/pkg/usr/share/mksyslinux/options.msg
 }
-
 md5sums=('6a269fc5b58c7bcc6688efeaa2075606'
- '35a9cdf3109777b45a229f1fd33f46af'
+ 'cc85beaf16111b9509c52f1b360eee6f'
  '498997ebe6bba351bdfbaa59f5d8e523'
  'b211c5f7e30d2ee36cde20f71aa3f2b8')

Modified: mksyslinux
===
--- mksyslinux  2010-08-26 09:33:58 UTC (rev 88916)
+++ mksyslinux  2010-08-26 10:02:24 UTC (rev 88917)
@@ -107,7 +107,7 @@
 echo :: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ... 
 # generate initramdisk
 echo :: Creating initramdisk ...
-   mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g 
${TEMPDIR}/initrd.img
+   mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g 
${TEMPDIR}/boot/initrd.img
 echo :: Using ${KERNEL} as image kernel ...
install -m644 ${KERNEL} ${TEMPDIR}/boot/vmlinuz
install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux mksyslinux.conf)

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux mksyslinux.conf)

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux)

[arch-commits] Commit in mksyslinux/trunk (PKGBUILD mksyslinux)

4 matches

Site Navigation

Mail list logo

Footer information