jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'x/master'

Browse source 
* x/master:
  base-files: vkpurge: print correct kernel version.
  eog: update to 3.4.2.
  kernel-snapshot: update to 3.5.0-rc2.
  base-files: improved vkpurge to detect obsoletes kernel-snapshot pkgs.
This commit is contained in:
davehome 2012-06-09 03:47:38 -06:00
commit 9a2deedaa9
6 changed files with 21 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
srcpkgs/base-files/files/vkpurge
View file

@ -23,15 +23,14 @@ _EOF
list_kernels() list_kernels()
{ {
local k kpkg installed kver kvertmp skip _f local k kpkg installed kver skip _f
for k in /boot/initramfs-*.img; do for k in /lib/modules/*; do
_f=$(basename $k) _f=$(basename $k)
kver=$(xbps-uhelper getpkgversion ${_f}) kver=$(echo ${_f}|sed -e 's|-rc|rc|')
kvertmp=$(xbps-uhelper getpkgversion ${_f}|sed -e 's|-rc|rc|')
for kpkg in kernel kernel-snapshot; do for kpkg in kernel kernel-snapshot; do
installed=$(xbps-uhelper -r / version $kpkg) installed=$(xbps-uhelper -r / version $kpkg)
if [ "$installed" = "${kvertmp%.img}" ]; then if [ "$installed" = "${kver}" ]; then
skip=1 skip=1
break break
fi fi
@ -40,7 +39,7 @@ list_kernels()
unset skip unset skip
continue continue
fi fi
echo "${kver%.img}" echo "${_f}"
done done
} }

6
srcpkgs/base-files/template
View file

@ -1,10 +1,10 @@
# Template file for 'base-files' # Template file for 'base-files'
pkgname=base-files pkgname=base-files
version=0.64 version=0.66
revision=1
noarch=yes noarch=yes
bootstrap=yes bootstrap=yes
fulldepends="base-directories xbps-triggers" fulldepends="base-directories xbps-triggers"
revision=1
short_desc="Void GNU/Linux base system files" short_desc="Void GNU/Linux base system files"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://code.google.com/p/xbps" homepage="http://code.google.com/p/xbps"
@ -43,7 +43,7 @@ do_install() {
usb-load-ehci-first.conf usb-load-ehci-first.conf
vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d vinstall ${FILESDIR}/blacklist.conf 644 etc/modprobe.d
# Install comman licenses, from Debian. # Install common licenses, from Debian.
vmkdir usr/share/licenses vmkdir usr/share/licenses
install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses install -m644 ${FILESDIR}/licenses/* ${DESTDIR}/usr/share/licenses

7
srcpkgs/eog/eog-devel.template
View file

@ -1,16 +1,13 @@
# Template file for 'eog-devel'. # Template file for 'eog-devel'.
# #
noarch=yes
depends="gtk+3-devel" depends="gtk+3-devel"
short_desc="${sourcepkg} - development files" short_desc="${sourcepkg} - development files"
long_desc="${long_desc} long_desc="${long_desc}
This package contains files for development, headers, static libs, etc." This package contains files for development, headers, static libs, etc."
do_install() {
noarch=yes
do_install()
{
vmove usr/include usr vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib vmove usr/lib/pkgconfig usr/lib
vmove usr/share/gtk-doc usr/share vmove usr/share/gtk-doc usr/share

16
srcpkgs/eog/template
View file

@ -1,26 +1,22 @@
# Template file for 'eog' # Template file for 'eog'
pkgname=eog pkgname=eog
version=3.4.1 version=3.4.2
distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz" revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-scrollkeeper" configure_args="--disable-scrollkeeper"
depends="hicolor-icon-theme desktop-file-utils" depends="hicolor-icon-theme desktop-file-utils"
makedepends="which pkg-config intltool gnome-doc-utils gnome-desktop-devel libpeas-devel lcms2-devel exempi-devel libexif-devel librsvg-devel" makedepends="which pkg-config intltool gnome-doc-utils gnome-desktop-devel libpeas-devel lcms2-devel exempi-devel libexif-devel librsvg-devel"
fulldepends="gnome-icon-theme gsettings-desktop-schemas shared-mime-info" fulldepends="gnome-icon-theme gsettings-desktop-schemas shared-mime-info"
revision=2 gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="eog-devel"
short_desc="Eye of GNOME graphics viewer program" short_desc="Eye of GNOME graphics viewer program"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.gnome.org" homepage="http://www.gnome.org"
license="GPL-2" license="GPL-2"
checksum=cf29997ee065341fa323abc849732bfa18ab564cc0d931d61eaa473953d3e216 distfiles="${GNOME_SITE}/eog/3.4/eog-$version.tar.xz"
checksum=8dd79cd2118ba6055efc4ebe815bdeeeb3c1310bb915035c1a56ef3188c75d5a
long_desc=" long_desc="
eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop eog or the Eye of GNOME is a simple graphics viewer for the GNOME desktop
which uses the gdk-pixbuf library. It can deal with large images, and zoom which uses the gdk-pixbuf library. It can deal with large images, and zoom
and scroll with constant memory usage. Its goals are simplicity and and scroll with constant memory usage. Its goals are simplicity and
standards compliance." standards compliance."
gtk_iconcache_dirs="/usr/share/icons/hicolor"
subpackages="eog-devel"

5
srcpkgs/kernel-snapshot/files/x86_64-dotconfig
View file

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86_64 3.5.0-rc1 Kernel Configuration # Linux/x86_64 3.5.0-rc2 Kernel Configuration
# #
CONFIG_64BIT=y CONFIG_64BIT=y
# CONFIG_X86_32 is not set # CONFIG_X86_32 is not set
@ -54,7 +54,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_EXPERIMENTAL=y CONFIG_EXPERIMENTAL=y
CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE="" CONFIG_CROSS_COMPILE=""
CONFIG_LOCALVERSION=1" CONFIG_LOCALVERSION=""
# CONFIG_LOCALVERSION_AUTO is not set # CONFIG_LOCALVERSION_AUTO is not set
CONFIG_HAVE_KERNEL_GZIP=y CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y CONFIG_HAVE_KERNEL_BZIP2=y
@ -440,6 +440,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64 CONFIG_X86_RESERVE_LOW=64

4
srcpkgs/kernel-snapshot/template
View file

@ -2,7 +2,7 @@
# #
_kmajor=3.5 _kmajor=3.5
_kminor=0 _kminor=0
_kpatch=rc1 _kpatch=rc2
pkgname=kernel-snapshot pkgname=kernel-snapshot
version=${_kmajor}.${_kminor}${_kpatch} version=${_kmajor}.${_kminor}${_kpatch}
@ -23,7 +23,7 @@ long_desc="
This package provides the linux kernel image and associated modules This package provides the linux kernel image and associated modules
for the testing kernel (future stable releases)." for the testing kernel (future stable releases)."
distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}-${_kpatch}.tar.xz" distfiles="http://www.kernel.org/pub/linux//kernel/v3.0/testing/linux-${_kmajor}-${_kpatch}.tar.xz"
checksum=0e70f05246c8f2f1720bb4028b7c867a4c54b43f5603cbdcafd3dc772faa0ee2 checksum=d450b1a2debe246864b1b494b00b74f29965306c63e4d5095d7be6eb5b65da7c
if [ -n "$revision" ]; then if [ -n "$revision" ]; then
_kernver="${_kmajor}.${_kminor}-${_kpatch}_${revision}" _kernver="${_kmajor}.${_kminor}-${_kpatch}_${revision}"