Thu Jun 6 00:08:39 PDT 2013

7 files changed, 168 insertions, 10 deletions

diff --git a/libre/devtools-legacy/PKGBUILD b/libre/devtools-legacy/PKGBUILD
new file mode 100644
index 000000000..2ff4cbc42
--- /dev/null
+++ b/libre/devtools-legacy/PKGBUILD
@@ -0,0 +1,28 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=devtools-legacy
+_pkgname=devtools
+pkgver=20130408
+pkgrel=1
+pkgdesc='Tools for Arch Linux package maintainers (legacy)'
+arch=('any')
+license=('GPL')
+url='http://projects.archlinux.org/devtools.git/'
+depends=('namcap' 'openssh' 'subversion' 'rsync' 'arch-install-scripts')
+conflicts=$_pkgname
+source=("ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz"
+        "ftp://ftp.archlinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz.sig")
+md5sums=('12b42b429744af6517ae789f728e9f63'
+         'SKIP')
+
+build() {
+	cd ${srcdir}/${_pkgname}-${pkgver}
+	make PREFIX=/usr
+}
+
+package() {
+	cd ${srcdir}/${_pkgname}-${pkgver}
+	make PREFIX=/usr DESTDIR=${pkgdir} install
+}
+
diff --git a/libre/libretools-legacy/PKGBUILD b/libre/libretools-legacy/PKGBUILD
new file mode 100644
index 000000000..59e383449
--- /dev/null
+++ b/libre/libretools-legacy/PKGBUILD
@@ -0,0 +1,100 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+# Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+
+pkgbase=libretools
+pkgname=(libretools-legacy libretools-legacy-pr libretools-legacy-mips64el)
+pkgver=20120924
+pkgrel=1
+pkgdesc="Programs for Parabola development (legacy)"
+arch=('any')
+url="http://parabolagnulinux.org"
+license=('GPL3+')
+depends=(openssh rsync git wget devtools-legacy)
+install=libretools-legacy.install
+source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-v$pkgver.tar)
+md5sums=(dfb8cb24d3deda29178d0fdc20b0e4bd)
+conflicts=libretools
+
+package_libretools-legacy() {
+  backup=(etc/libretools.conf)
+
+  cd $srcdir/$pkgbase-v$pkgver
+
+  # fixing librebasebuilder librechroot libremakepkg !!!NEED MORE PATCH for makechrootpkg -d and mkarchroot -n!!!
+  # more info in:
+  # https://projects.archlinux.org/devtools.git/commit/?id=abba9f07a6d703cd97fc2d2bbd397072d5bf796d
+  # https://projects.archlinux.org/devtools.git/commit/?id=453558c4bb44b4bff43fcd22f96d4cfe1dbcf6f1
+  #sed -i 's|makechrootpkg -d -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|makechrootpkg -r "$CHROOTDIR" -l "$CHROOT" -- $MAKEPKG_ARGS|;
+  #        s|mkarchroot -n|mkarchroot|;
+  #        s|mkarchroot -r "/clean" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "/clean"|;
+  #        s|mkarchroot -r "bash" "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" "bash"|;
+  #        s|mkarchroot -u "${CHROOTDIR}/${CHROOTNAME}"|arch-nspawn "${CHROOTDIR}/${CHROOTNAME}" pacman -Syu --noconfirm|;
+  #       ' librebasebuilder librechroot libremakepkg
+
+  install -d ${pkgdir}/etc/libretools.d
+  install -m644 libretools.conf ${pkgdir}/etc/
+
+  install -d ${pkgdir}/usr/bin
+  install -m755 abslibre-commit        ${pkgdir}/usr/bin
+  install -m755 add-mips64el           ${pkgdir}/usr/bin
+  install -m755 aur                    ${pkgdir}/usr/bin
+  install -m755 buildenv               ${pkgdir}/usr/bin
+  install -m755 chcleanup              ${pkgdir}/usr/bin
+  install -m755 createworkdir          ${pkgdir}/usr/bin
+  install -m755 diff-unfree            ${pkgdir}/usr/bin
+  install -m755 fullpkg                ${pkgdir}/usr/bin
+  install -m755 fullpkg-build          ${pkgdir}/usr/bin
+  install -m755 fullpkg-find           ${pkgdir}/usr/bin
+  install -m755 is_built               ${pkgdir}/usr/bin
+  install -m755 is_unfree              ${pkgdir}/usr/bin
+  install -m755 lb                     ${pkgdir}/usr/bin
+  install -m755 libreaddiff            ${pkgdir}/usr/bin
+  install -m755 librebasebuilder       ${pkgdir}/usr/bin
+  install -m755 librechroot            ${pkgdir}/usr/bin
+  install -m755 librecommit            ${pkgdir}/usr/bin
+  install -m755 librediff              ${pkgdir}/usr/bin
+  install -m755 libremakepkg           ${pkgdir}/usr/bin
+  install -m755 libremessages          ${pkgdir}/usr/bin
+  install -m755 libremkchroot          ${pkgdir}/usr/bin
+  install -m755 librerelease           ${pkgdir}/usr/bin
+  install -m755 librerepkg             ${pkgdir}/usr/bin
+  install -m755 librestage             ${pkgdir}/usr/bin
+  install -m755 pkgbuild-check-nonfree ${pkgdir}/usr/bin
+  install -m755 toru                   ${pkgdir}/usr/bin
+  install -m755 toru-path              ${pkgdir}/usr/bin
+  install -m755 toru-utils             ${pkgdir}/usr/bin
+  install -m755 toru-where             ${pkgdir}/usr/bin
+  install -m755 updateabslibre         ${pkgdir}/usr/bin
+  install -m755 update-cleansystem     ${pkgdir}/usr/bin
+  
+  install -d ${pkgdir}/usr/share/pacman
+  install -m755 rePKGBUILD.proto ${pkgdir}/usr/share/pacman
+}
+
+package_libretools-legacy-pr() {
+  backup=('etc/libretools.d/prtools.conf')
+
+  cd $srcdir/$pkgbase-v$pkgver
+
+  install -d ${pkgdir}/etc/libretools.d
+  install -m644 prtools/prtools.conf ${pkgdir}/etc/libretools.d
+
+  install -d ${pkgdir}/usr/bin
+  install -m755 prtools/prfullpkg ${pkgdir}/usr/bin
+  install -m755 prtools/prmipsrelease ${pkgdir}/usr/bin
+  install -m755 prtools/prtoru ${pkgdir}/usr/bin
+}
+
+package_libretools-legacy-mips64el() {
+  backup=('etc/libretools.d/mips64el.conf')
+
+  cd $srcdir/$pkgbase-v$pkgver
+
+  install -d ${pkgdir}/etc/libretools.d
+  install -m755 mips64el/mips64el.conf ${pkgdir}/etc/libretools.d
+
+  install -d ${pkgdir}/usr/bin
+  install -m755 mips64el/mips-add ${pkgdir}/usr/bin
+  install -m755 mips64el/mipsrelease ${pkgdir}/usr/bin
+}
diff --git a/libre/libretools-legacy/libretools-legacy.install b/libre/libretools-legacy/libretools-legacy.install
new file mode 100644
index 000000000..3ede1f904
--- /dev/null
+++ b/libre/libretools-legacy/libretools-legacy.install
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# arg 1:  the new package version
+post_install() {
+  cat <<EOF
+Please check https://wiki.parabolagnulinux.org/Package_maintainer_guide
+and follow instructions there before using libretools.
+
+If you plan using fullpkg you should read https://wiki.parabolagnulinux.org/fullpkg
+and install libretools-\$arch if avaliable
+
+EOF
+  update-cleansystem
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  cat <<EOF
+Check your /etc/libretools.conf, it has changed substantially.
+
+If using fullpkg, you should install libretools-\$arch if avaliable
+
+EOF
+  update-cleansystem
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 9f67689df..815f28b96 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Joshua Haase <hahj87@gmail.com
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 # Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@lavabit.com>
 
 pkgbase=libretools
 pkgname=(libretools libretools-mips64el)
@@ -9,11 +10,11 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/libretools.git/"
 license=('GPL3+' 'GPL2')
 
-pkgrel=3
+pkgrel=4
 arch=('any')
 groups=(base-devel)
 depends=(openssh rsync git wget tokyocabinet)
-conflicts=(chroottools)
+conflicts=(chroottools devtools libretools-legacy)
 source=(https://projects.parabolagnulinux.org/$pkgbase.git/snapshot/$pkgbase-$pkgver.tar)
 
 build() {
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
index 16d595f12..a64f141fd 100644
--- a/libre/mksyslinux/PKGBUILD
+++ b/libre/mksyslinux/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186874 2013-05-31 13:27:18Z tpowa $
+# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=mksyslinux
-pkgver=2013.05
+pkgver=2013.06
 pkgrel=1
 pkgdesc="Advanced, modular syslinux boot image creation utility (Parabola rebranded)"
 arch=(any)
@@ -21,6 +21,6 @@ package()
   install -D -m644 options.msg  "$pkgdir/usr/share/mksyslinux/options.msg"
 }
 md5sums=('287aad9693ca8061495e248c41ba43a7'
-         'd958575945e4ce8a9002bd056e2f14be'
-         '1f1e2d80e28b087e4103282bc5c44071'
+         '0a9fd93356b5d98ab386f28bc849b808'
+         '15742e47e40a46491694b4b7680d4e38'
          'ae0007d6679b5a575b2a9e5ac3664baf')
diff --git a/libre/mksyslinux/mksyslinux b/libre/mksyslinux/mksyslinux
index 4db771f83..96ad45133 100755
--- a/libre/mksyslinux/mksyslinux
+++ b/libre/mksyslinux/mksyslinux
@@ -71,13 +71,14 @@ export RUNPROGRAM="${APPNAME}"
 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 @@ else
 	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 @@ else
 	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}
diff --git a/libre/mksyslinux/mksyslinux.conf b/libre/mksyslinux/mksyslinux.conf
index ab2d4978a..cfbfc49d8 100644
--- a/libre/mksyslinux/mksyslinux.conf
+++ b/libre/mksyslinux/mksyslinux.conf
@@ -20,7 +20,7 @@ KERNEL="/boot/vmlinuz-linux-libre"
 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