From d0c9bc2edf0e672a6a0eb5917ee6e5f02814c71a Mon Sep 17 00:00:00 2001 From: Phil Date: Tue, 1 Nov 2011 10:22:29 +0000 Subject: [PATCH] filesystem: bump to 2011.11.0 initscripts: dito linux-firmware: update firmwares mkinitcpio: bump to 0.7.5 udev: bump to 174 - update rules --- asciidoc/PKGBUILD | 53 ++++++++++++++++ filesystem/PKGBUILD | 10 +-- initscripts/PKGBUILD | 33 +++++----- initscripts/initscripts.install | 17 +++-- linux-firmware/PKGBUILD | 8 +-- mkinitcpio-busybox/PKGBUILD | 32 +++++----- mkinitcpio-busybox/config | 107 ++++++++++++++++++++------------ mkinitcpio/PKGBUILD | 16 ++--- udev/81-chakra.rules | 64 ++----------------- udev/PKGBUILD | 25 +++++--- 10 files changed, 203 insertions(+), 162 deletions(-) create mode 100644 asciidoc/PKGBUILD diff --git a/asciidoc/PKGBUILD b/asciidoc/PKGBUILD new file mode 100644 index 000000000..27af0e15a --- /dev/null +++ b/asciidoc/PKGBUILD @@ -0,0 +1,53 @@ + +pkgname=asciidoc +pkgver=8.6.6 +pkgrel=1 +pkgdesc='Text document format for short documents, articles, books and UNIX man pages.' +arch=('any') +url='http://www.methods.co.nz/asciidoc/' +license=('GPL') +depends=('python2' 'libxslt' 'docbook-xsl') +optdepends=('lilypond: music-filter' + 'imagemagick: music-filter (used in conjunction with lilypond)' + 'source-highlight: source-highlight-filter' + 'dblatex: pdf generation' + 'fop: alternative pdf generation' + 'lynx: text generation' + 'w3m: text generation (alternative to lynx)') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('44b872d9c300ffa5a8fe8b3c4d10957c') + +build() { + cd ${pkgname}-${pkgver} + + # python2 fix + for file in asciidocapi.py a2x.py asciidoc.py filters/music/music2png.py filters/latex/latex2png.py \ + filters/code/code-filter.py filters/graphviz/graphviz2png.py; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + sed -i -e 's_sys:python_sys:python2_g' -e 's_sys3:python_sys3:python2_g' xhtml11.conf + sed -i 's_sys:python_sys:python2_g' xhtml11-quirks.conf + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc +} + +package() { + cd ${pkgname}-${pkgver} + + make install DESTDIR=${pkgdir} + + install -Dm644 asciidocapi.py \ + ${pkgdir}/usr/lib/python2.7/site-packages/asciidocapi.py + + install -Dm644 vim/syntax/asciidoc.vim \ + ${pkgdir}/usr/share/vim/vimfiles/syntax/asciidoc.vim + + install -Dm644 vim/ftdetect/asciidoc_filetype.vim \ + ${pkgdir}/usr/share/vim/vimfiles/ftdetect/asciidoc.vim + + # fix FS#21579 - [asciidoc] 8.6.2-2 "asciidoc" table style doesn't work (mismatched python version) + sed -i 's/python/python2/' \ + ${pkgdir}/etc/asciidoc/asciidoc.conf +} \ No newline at end of file diff --git a/filesystem/PKGBUILD b/filesystem/PKGBUILD index 6d9450ca4..d74915c7f 100644 --- a/filesystem/PKGBUILD +++ b/filesystem/PKGBUILD @@ -5,8 +5,8 @@ # maintainer (x86_64): Manuel Tortosa pkgname=filesystem -pkgver=2011.09 -pkgrel=2 +pkgver=2011.11.0 +pkgrel=1 _codename=Edn pkgdesc="Base filesystem" arch=('any') @@ -19,8 +19,8 @@ backup=(etc/fstab etc/crypttab etc/group etc/hosts etc/ld.so.conf etc/passwd etc/shadow etc/gshadow etc/resolv.conf etc/motd etc/nsswitch.conf etc/shells etc/host.conf etc/securetty etc/profile etc/issue etc/chakra-release) -source=("http://chakra-project.org/sources/${pkgname}/${pkgname}-${pkgver}-0.2011.06.17.tar.xz") -md5sums=('3d9022e13bb10fbf131d27a6584a58f7') +source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.xz") +md5sums=('646e0ae42faae3c67e79cfa82ee377e3') # create tarball: source PKGBUILD && mksource @@ -62,7 +62,7 @@ package() { install -m600 ${srcdir}/chakra-${pkgname}/${f} ${pkgdir}/etc/ done - install -D -m644 ${srcdir}/chakra-${pkgname}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf + install -D -m644 ${srcdir}/chakra-${pkgname}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf # # setup /var diff --git a/initscripts/PKGBUILD b/initscripts/PKGBUILD index 4ba33e263..8e8ac654a 100644 --- a/initscripts/PKGBUILD +++ b/initscripts/PKGBUILD @@ -5,40 +5,43 @@ # maintainer (x86_64): Manuel Tortosa pkgname=initscripts -pkgver=2011.09.1 -_pkgver=2011.09 +pkgver=2011.11.0 pkgrel=1 +_codename=Edn pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.chakra-project.org" license=('GPL2') groups=('base') backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless) -depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=171-2' 'iproute2' +depends=('glibc' 'bash' 'grep' 'coreutils' 'udev>=174' 'iproute2' 'ncurses' 'kbd' 'findutils' 'sysvinit') optdepends=('bridge-utils: Network bridging support' 'dhcpcd: DHCP network configuration' 'net-tools: legacy network support' 'wireless_tools: Wireless networking') +makedepends=(asciidoc) install=initscripts.install -source=("http://chakra-project.org/sources/initscripts/initscripts-${_pkgver}.tar.xz" - 'http://chakra-project.org/sources/initscripts/wireless.conf.d') -sha256sums=('569041e2009fc4b9fe3011d459443fd82dbbeee7c79cb796d88abb8e598d9448' - '0eba4250b07e0a727ef64772f5ee9027b123cbd4bb0894ba2842f545035c827f') +source=("http://chakra.sourceforge.net/sources/${pkgname}/${pkgname}-${pkgver}.tar.xz" + 'wireless.conf.d') # create tarball: source PKGBUILD && mksource mksource() { - rm -vRf ${pkgname}-${_pkgver} - git clone git://gitorious.org/chakra/chakra-${pkgname}.git ${pkgname}-${_pkgver} - rm -vRf ${pkgname}-${_pkgver}/.git - pushd ${pkgname}-${_pkgver} - popd - tar -cvJf ${pkgname}-${_pkgver}.tar.xz ${pkgname}-${_pkgver}/* - sha256sum ${pkgname}-${_pkgver}.tar.xz + rm -vRf chakra-${pkgname} + git clone git://gitorious.org/chakra/chakra-${pkgname}.git + rm -vRf chakra-${pkgname}/.git + pushd chakra-${pkgname} + popd + tar -cvJf ${pkgname}-${pkgver}.tar.xz chakra-${pkgname}/* + md5sum ${pkgname}-${pkgver}.tar.xz } + package() { - cd ${srcdir}/${pkgname}-${_pkgver} + cd ${srcdir}/chakra-${pkgname} make DESTDIR=${pkgdir} install install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless } + +md5sums=('e0e4758bc7e5bc6feb01d3f686329582' + '027576534885b8d5dded9be546057b12') diff --git a/initscripts/initscripts.install b/initscripts/initscripts.install index 360101c10..6daf7f827 100644 --- a/initscripts/initscripts.install +++ b/initscripts/initscripts.install @@ -1,7 +1,14 @@ post_upgrade() { - if [ "$(vercmp $2 2009.07)" -lt 0 ]; then - echo "==> Adjusting /etc/inittab for transition to /dev/tty standard." - echo "==> Original file saved as /etc/inittab.pacsave" - sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab + if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then + echo "Blacklisting of modules is no longer supported in rc.conf," + echo "please add blacklist entries to /etc/modprobe.d/ instead." fi -} + if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then + echo "VERBOSE= in rc.conf no longer has any effect." + echo "Please append 'quiet' to your kernel command line." + fi + if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then + echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf," + echo "as LOCALE in /etc/rc.conf no longer works." + fi +} \ No newline at end of file diff --git a/linux-firmware/PKGBUILD b/linux-firmware/PKGBUILD index ca8831512..47b681bf1 100644 --- a/linux-firmware/PKGBUILD +++ b/linux-firmware/PKGBUILD @@ -5,7 +5,7 @@ # maintainer (x86_64): Manuel Tortosa pkgname=linux-firmware -pkgver=20110819 +pkgver=20111101 _b43=4.178.10.4 _legacy=3.130.20.0 _nouveau=20091212 @@ -14,7 +14,7 @@ pkgdesc="Firmware files for Linux" arch=('any') url="http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" license=('GPL2' 'GPL3' 'custom') -provides=('kernel26-firmware=3.0.99' 'linux-firmware=3.0.99') +provides=('kernel26-firmware=3.1.99' 'linux-firmware=3.1.99') conflicts=('linux-firmware-git' 'kernel26-firmware' 'ar9170-fw' @@ -48,12 +48,12 @@ replaces=('kernel26-firmware' 'nouveau-firmware') makedepends=("b43-fwcutter=014") options=(!strip) -source=(http://chakra-project.org/sources/linux-firmware/$pkgname-$pkgver.tar.xz +source=(http://chakra.sourceforge.net/sources/linux-firmware/$pkgname-$pkgver.tar.xz http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw http://mirror2.openwrt.org/sources/broadcom-wl-${_b43}.tar.bz2 http://downloads.openwrt.org/sources/wl_apsta-${_legacy}.o http://people.freedesktop.org/~pq/nouveau-drm/nouveau-firmware-$_nouveau.tar.gz) -sha256sums=('19c808bba9d7bdded230667095da242ac9f933618fcac4fb2ebc19bcafd25e32' +sha256sums=('df6cc48f6437a65ba63f10da82101329e36931263761a9a823da84d99384d6b4' '1b379c5a8d6ab3a43911f7949d6306fe2dae3afb1368be5452a8fc7d9c54e0a0' '32f6ad98facbb9045646fdc8b54bb03086d204153253f9c65d0234a5d90ae53f' '7dba610b1d96dd14e901bcbce14cd6ecd1b1ac6f5c0035b0d6b6dc46a7c3ef90' diff --git a/mkinitcpio-busybox/PKGBUILD b/mkinitcpio-busybox/PKGBUILD index 952c3b8fd..5da1277d5 100644 --- a/mkinitcpio-busybox/PKGBUILD +++ b/mkinitcpio-busybox/PKGBUILD @@ -5,30 +5,32 @@ # maintainer (x86_64): Manuel Tortosa pkgname=mkinitcpio-busybox -pkgver=1.18.4 -pkgrel=2 +pkgver=1.19.2 +pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64') url="http://www.busybox.net/" license=('GPL') depends=('glibc') -source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 - config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') +options=() +source=("http://busybox.net/downloads/busybox-$pkgver.tar.bz2" + 'config') +sha256sums=('ea7ec9b6df70b8c528f4a2b6300e9913431c7223308fb08dfafa7508d75a0cb9' + '21ae2cd21e33ba1ef9500a9b14273579fc554bf995cfd7907fb3fe94fc162cf8') build() { - cd "${srcdir}/busybox-${pkgver}" + cd "$srcdir/busybox-$pkgver" + + local safeflags="${CARCH/_/-} -mtune=generic -Os -pipe -fno-strict-aliasing" + + sed 's|^\(CONFIG_EXTRA_CFLAGS\)=.*|\1="-march='"$safeflags"'"|' \ + "$srcdir/config" > .config - unset CFLAGS CXXFLAGS - if [ ${CARCH} = "x86_64" ]; then - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=x86-64 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - else - sed 's|^CONFIG_EXTRA_CFLAGS=.*|CONFIG_EXTRA_CFLAGS="-march=i686 -mtune=generic -Os -pipe -fno-strict-aliasing"|' "${srcdir}/config" > .config - fi make } package() { - install -D -m755 "${srcdir}/busybox-${pkgver}"/busybox "${pkgdir}/lib/initcpio/busybox" -} \ No newline at end of file + install -Dm755 "$srcdir/busybox-$pkgver/busybox" "$pkgdir/lib/initcpio/busybox" +} + +# vim:set ts=2 sw=2 et: diff --git a/mkinitcpio-busybox/config b/mkinitcpio-busybox/config index 1aa333faf..86160a203 100644 --- a/mkinitcpio-busybox/config +++ b/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 +# Busybox version: 1.19.2 +# Sun Oct 16 15:24:19 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -39,8 +39,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set -# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_UTMP is not set +# CONFIG_FEATURE_WTMP is not set # CONFIG_FEATURE_PIDFILE is not set CONFIG_FEATURE_SUID=y # CONFIG_FEATURE_SUID_CONFIG is not set @@ -89,8 +89,10 @@ CONFIG_PREFIX="./_install" # # Busybox Library Tuning # +# CONFIG_FEATURE_SYSTEMD is not set +# CONFIG_FEATURE_RTMINMAX is not set CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 +CONFIG_MD5_SIZE_VS_SPEED=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -99,6 +101,7 @@ CONFIG_FEATURE_EDITING_MAX_LEN=1024 # CONFIG_FEATURE_EDITING_VI is not set CONFIG_FEATURE_EDITING_HISTORY=15 # CONFIG_FEATURE_EDITING_SAVEHISTORY is not set +# CONFIG_FEATURE_REVERSE_SEARCH is not set CONFIG_FEATURE_TAB_COMPLETION=y # CONFIG_FEATURE_USERNAME_COMPLETION is not set CONFIG_FEATURE_EDITING_FANCY_PROMPT=y @@ -106,6 +109,7 @@ CONFIG_FEATURE_EDITING_FANCY_PROMPT=y CONFIG_FEATURE_NON_POSIX_CP=y CONFIG_FEATURE_VERBOSE_CP_MESSAGE=y CONFIG_FEATURE_COPYBUF_KB=4 +CONFIG_FEATURE_SKIP_ROOTFS=y CONFIG_MONOTONIC_SYSCALL=y CONFIG_IOCTL_HEX2STR_ERROR=y # CONFIG_FEATURE_HWIB is not set @@ -169,12 +173,17 @@ CONFIG_CAT=y # CONFIG_FEATURE_DATE_ISOFMT is not set # CONFIG_FEATURE_DATE_NANO is not set # CONFIG_FEATURE_DATE_COMPAT is not set +# CONFIG_ID is not set +# CONFIG_GROUPS is not set CONFIG_TEST=y CONFIG_FEATURE_TEST_64=y +CONFIG_TOUCH=y # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set # CONFIG_BASE64 is not set +# CONFIG_WHO is not set +# CONFIG_USERS is not set # CONFIG_CAL is not set # CONFIG_CATV is not set CONFIG_CHGRP=y @@ -212,10 +221,8 @@ CONFIG_FALSE=y CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set -# CONFIG_ID is not set CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -# CONFIG_LENGTH is not set CONFIG_LN=y # CONFIG_LOGNAME is not set CONFIG_LS=y @@ -227,7 +234,7 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y # CONFIG_FEATURE_LS_COLOR is not set # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set +CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y @@ -247,9 +254,9 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -262,12 +269,11 @@ CONFIG_FEATURE_STAT_FORMAT=y # CONFIG_STTY is not set # CONFIG_SUM is not set # CONFIG_SYNC is not set -# CONFIG_TAC is not set +CONFIG_TAC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y # CONFIG_TEE is not set # CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set -CONFIG_TOUCH=y CONFIG_TRUE=y # CONFIG_TTY is not set CONFIG_UNAME=y @@ -279,7 +285,6 @@ CONFIG_UNIQ=y # CONFIG_UUENCODE is not set CONFIG_WC=y CONFIG_FEATURE_WC_LARGE=y -# CONFIG_WHO is not set # CONFIG_WHOAMI is not set CONFIG_YES=y @@ -297,7 +302,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # Common options for df, du, ls # CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities @@ -346,20 +355,13 @@ CONFIG_MKTEMP=y # Editors # # CONFIG_PATCH is not set -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -CONFIG_SED=y CONFIG_VI=y CONFIG_FEATURE_VI_MAX_LEN=4096 CONFIG_FEATURE_VI_8BIT=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y CONFIG_FEATURE_VI_SEARCH=y +# CONFIG_FEATURE_VI_REGEX_SEARCH is not set CONFIG_FEATURE_VI_USE_SIGNALS=y CONFIG_FEATURE_VI_DOT_CMD=y CONFIG_FEATURE_VI_READONLY=y @@ -368,6 +370,14 @@ CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y +CONFIG_AWK=y +# CONFIG_FEATURE_AWK_LIBM is not set +# CONFIG_CMP is not set +# CONFIG_DIFF is not set +# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set +# CONFIG_FEATURE_DIFF_DIR is not set +# CONFIG_ED is not set +CONFIG_SED=y # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -415,7 +425,7 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_HALT=y # CONFIG_FEATURE_CALL_TELINIT is not set CONFIG_TELINIT_PATH="" -# CONFIG_INIT is not set +CONFIG_INIT=y # CONFIG_FEATURE_USE_INITTAB is not set # CONFIG_FEATURE_KILL_REMOVED is not set CONFIG_FEATURE_KILL_DELAY=0 @@ -426,6 +436,7 @@ CONFIG_FEATURE_KILL_DELAY=0 # CONFIG_FEATURE_INITRD is not set CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_MESG is not set +# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # # Login/Password Management Utilities @@ -511,6 +522,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_ACPID is not set # CONFIG_FEATURE_ACPID_COMPAT is not set # CONFIG_BLKID is not set +# CONFIG_FEATURE_BLKID_TYPE is not set CONFIG_DMESG=y CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FBSET is not set @@ -519,7 +531,7 @@ CONFIG_FEATURE_DMESG_PRETTY=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -CONFIG_FDISK_SUPPORT_LARGE_DISKS=y +# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set # CONFIG_FEATURE_FDISK_WRITABLE is not set # CONFIG_FEATURE_AIX_LABEL is not set # CONFIG_FEATURE_SGI_LABEL is not set @@ -614,10 +626,25 @@ CONFIG_VOLUMEID=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_LESS=y +CONFIG_FEATURE_LESS_MAXLINES=9999999 +CONFIG_FEATURE_LESS_BRACKETS=y +CONFIG_FEATURE_LESS_FLAGS=y +# CONFIG_FEATURE_LESS_MARKS is not set +# CONFIG_FEATURE_LESS_REGEXP is not set +# CONFIG_FEATURE_LESS_WINCH is not set +# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set +# CONFIG_FEATURE_LESS_DASHCMD is not set +# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_NANDWRITE is not set # CONFIG_NANDDUMP is not set +# CONFIG_SETSERIAL is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set +# CONFIG_UBIMKVOL is not set +# CONFIG_UBIRMVOL is not set +# CONFIG_UBIRSVOL is not set +# CONFIG_UBIUPDATEVOL is not set # CONFIG_ADJTIMEX is not set # CONFIG_BBCONFIG is not set # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set @@ -658,15 +685,6 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_LAST is not set # CONFIG_FEATURE_LAST_SMALL is not set # CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set # CONFIG_HDPARM is not set # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set @@ -700,11 +718,17 @@ CONFIG_STRINGS=y # # Networking Utilities # +# CONFIG_NAMEIF is not set +# CONFIG_FEATURE_NAMEIF_EXTENDED is not set # CONFIG_NBDCLIENT is not set CONFIG_NC=y CONFIG_NC_SERVER=y CONFIG_NC_EXTRA=y # CONFIG_NC_110_COMPAT is not set +CONFIG_PING=y +CONFIG_PING6=y +CONFIG_FEATURE_FANCY_PING=y +# CONFIG_WHOIS is not set CONFIG_FEATURE_IPV6=y # CONFIG_FEATURE_UNIX_LOCAL is not set CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y @@ -777,17 +801,12 @@ CONFIG_IPRULE=y # CONFIG_IPCALC is not set # CONFIG_FEATURE_IPCALC_FANCY is not set # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set CONFIG_NETSTAT=y CONFIG_FEATURE_NETSTAT_WIDE=y CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set -CONFIG_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -820,12 +839,14 @@ CONFIG_FEATURE_TFTP_GET=y # CONFIG_DHCPRELAY is not set # CONFIG_DUMPLEASES is not set # CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set +# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set +# CONFIG_FEATURE_UDHCP_8021Q is not set CONFIG_UDHCPC_DEFAULT_SCRIPT="" CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" @@ -861,15 +882,19 @@ CONFIG_FEATURE_MIME_CHARSET="" # # CONFIG_IOSTAT is not set # CONFIG_MPSTAT is not set +# CONFIG_NMETER is not set # CONFIG_PMAP is not set # CONFIG_POWERTOP is not set +# CONFIG_PSTREE is not set +# CONFIG_PWDX is not set # CONFIG_SMEMCAP is not set +CONFIG_UPTIME=y +# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set CONFIG_FREE=y # CONFIG_FUSER is not set CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_KILLALL5 is not set -# CONFIG_NMETER is not set CONFIG_PGREP=y CONFIG_PIDOF=y CONFIG_FEATURE_PIDOF_SINGLE=y @@ -890,7 +915,6 @@ CONFIG_FEATURE_PS_WIDE=y # CONFIG_FEATURE_TOP_SMP_PROCESS is not set # CONFIG_FEATURE_TOPMEM is not set # CONFIG_FEATURE_SHOW_THREADS is not set -CONFIG_UPTIME=y # CONFIG_WATCH is not set # @@ -928,6 +952,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH=y CONFIG_ASH_BASH_COMPAT=y +# CONFIG_ASH_IDLE_TIMEOUT is not set CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_GETOPTS=y @@ -968,6 +993,7 @@ CONFIG_SH_MATH_SUPPORT=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set +# CONFIG_FEATURE_SH_HISTFILESIZE is not set # # System Logging Utilities @@ -976,6 +1002,7 @@ CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_SYSLOGD_DUP is not set +# CONFIG_FEATURE_SYSLOGD_CFG is not set CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 diff --git a/mkinitcpio/PKGBUILD b/mkinitcpio/PKGBUILD index 644c58049..0ad8845f2 100644 --- a/mkinitcpio/PKGBUILD +++ b/mkinitcpio/PKGBUILD @@ -5,26 +5,26 @@ # maintainer (x86_64): Manuel Tortosa pkgname=mkinitcpio -pkgver=0.7.2 +pkgver=0.7.5 pkgrel=1 pkgdesc="Modular initramfs image creation utility" -arch=(any) +arch=('any') url="http://www.archlinux.org/" license=('GPL') depends=('mkinitcpio-busybox>=1.16.1-2' 'module-init-tools' 'util-linux>=2.19' 'libarchive' 'coreutils' - 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2009.01-2' 'udev>=171-2' 'file' 'gzip' - 'which') + 'bash' 'findutils' 'sed' 'grep' 'filesystem>=2011.10-1' 'udev>=174-1' 'file' 'gzip') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' 'lzop: Use lzo compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd' 'klibc-module-init-tools' 'klibc-udev') -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz) +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) backup=(etc/mkinitcpio.conf) -sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d') +sha256sums=('3210e27fe689a021996d902c117b9c49dd9463c4424a2b3e2c428a4e4f31bff9') package() { - cd $srcdir/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } \ No newline at end of file diff --git a/udev/81-chakra.rules b/udev/81-chakra.rules index 1de05380a..c3fac4bed 100644 --- a/udev/81-chakra.rules +++ b/udev/81-chakra.rules @@ -1,26 +1,6 @@ -# Udev rules for Chakra GNU/Linux by Tobias Powalowski +# Udev rules for Chakra GNU/Linux by Phil Miller # do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" +# this file is going away in the near future # permissions for IDE CD devices SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" @@ -28,44 +8,8 @@ SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom # permissions for SCSI CD devices SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical" -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - # misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" +KERNEL=="sonypi", MODE="0666" # USB devices -KERNEL=="legousbtower*", MODE="0666" -####################################### -# Permissions and Symlinks - end -####################################### \ No newline at end of file +KERNEL=="legousbtower*", MODE="0666" \ No newline at end of file diff --git a/udev/PKGBUILD b/udev/PKGBUILD index 526e91efc..c30a505be 100644 --- a/udev/PKGBUILD +++ b/udev/PKGBUILD @@ -6,21 +6,22 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=173 +pkgver=174 pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') groups=('base') -# older initscripts versions required start_udev options=(!makeflags !libtool) -makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 +makedepends=('gobject-introspection' 'gperf') +#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 +source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2 81-chakra.rules 82-optical-symlinks.rules) build() { cd $srcdir/$pkgbase-$pkgver + ./configure --sysconfdir=/etc\ --with-rootlibdir=/lib\ --libexecdir=/lib/udev\ @@ -28,13 +29,13 @@ build() { --with-systemdsystemunitdir=/lib/systemd/system\ --disable-rule-generator\ --enable-udev_acl + make } package_udev() { pkgdesc="The userspace dev tools (udev)" - depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2' - 'module-init-tools>=3.11' 'pciutils') + depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils') install=udev.install backup=(etc/udev/udev.conf) conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') @@ -53,11 +54,14 @@ package_udev() { echo "blacklist $mod" done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf - # these static devices are created for convenience, to autoload the modules if necessary - # /dev/loop0 + # /dev/loop0 is created for convenience, to autoload the module if necessary + # may be obsoleted by https://lkml.org/lkml/2011/7/30/111 mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 chgrp disk ${pkgdir}/lib/udev/devices/loop0 + # udevd moved, symlink to make life easy for restarting udevd manually + ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group for i in $pkgdir/lib/udev/rules.d/*.rules; do sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; @@ -96,6 +100,7 @@ package_udev-compat() { # /dev/ppp mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 } -sha256sums=('70a18315a12f8fc1131f7da5b4dae3606988b69d5c08f96f443b84b8486caaaf' - 'b1bc9c86ec3ccdff87ef6926092c13e1bac4144c32879e826d240c79828aaf51' + +sha256sums=('832662179a5ff9782769b0feadd51aaaea6e603f91f6ef0ec8bb6aab0fb3ad1a' + '68f2d480d8e163ec3f6ecb13f37faccfc4f0c1093fa3788439d55be08da5e93b' '284b665b1fd149bf1e211009d3d630b18147d8b9f8b34f43fa46678f88b97f6d')