From 3aa76f01fc6ff1de8952a4337b486557ce22acb7 Mon Sep 17 00:00:00 2001 From: abveritas Date: Mon, 14 Jan 2013 04:07:54 +0000 Subject: [PATCH] partitionmanager update/build on new parted, chakra-init-live moved to core --- chakra-init-live/10-keyboard.conf | 5 - chakra-init-live/PKGBUILD | 30 -- chakra-init-live/chakra-init-live.install | 14 - chakra-init-live/live | 70 ---- chakra-init-live/locale_setup.sh | 369 ------------------ .../02_sane_env_and_shutdown_path.patch | 34 -- partitionmanager/PKGBUILD | 9 +- 7 files changed, 3 insertions(+), 528 deletions(-) delete mode 100644 chakra-init-live/10-keyboard.conf delete mode 100644 chakra-init-live/PKGBUILD delete mode 100644 chakra-init-live/chakra-init-live.install delete mode 100755 chakra-init-live/live delete mode 100644 chakra-init-live/locale_setup.sh delete mode 100644 kde-workspace/02_sane_env_and_shutdown_path.patch diff --git a/chakra-init-live/10-keyboard.conf b/chakra-init-live/10-keyboard.conf deleted file mode 100644 index b99c01c2e..000000000 --- a/chakra-init-live/10-keyboard.conf +++ /dev/null @@ -1,5 +0,0 @@ -Section "InputClass" - Identifier "Keyboard Defaults" - MatchIsKeyboard "yes" - Option "XkbLayout" "us" -EndSection diff --git a/chakra-init-live/PKGBUILD b/chakra-init-live/PKGBUILD deleted file mode 100644 index 225a5874f..000000000 --- a/chakra-init-live/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# -# Chakra Packages for Chakra, part of chakra-project.org -# -# maintainer: abveritas[at]chakra-project[dot]org> - -pkgname=chakra-init-live -pkgver=2012.11 -pkgrel=2 -pkgdesc="Live-session systemd startup scripts" -arch=('x86_64') -url="http://www.chakra-project.org" -license=('GPL2') -depends=('spun-live') -makedepends=('asciidoc') -install=${pkgname}.install -source=('live' 'locale_setup.sh' '10-keyboard.conf') -md5sums=('23d57a1388e1c2df66e0552a8112c115' - 'd5640418bdfb4970ccec0f0392fc023b' - '4df9f3c64316cf8b7f93729b389d704f') - -package() { - cd ${srcdir} - # setup /etc - mkdir ${pkgdir}/etc - install -m755 -t ${pkgdir}/etc live - install -m755 -t ${pkgdir}/etc locale_setup.sh - mkdir ${pkgdir}/etc/skel - install -m755 -t ${pkgdir}/etc/skel 10-keyboard.conf - -} diff --git a/chakra-init-live/chakra-init-live.install b/chakra-init-live/chakra-init-live.install deleted file mode 100644 index 174eb559e..000000000 --- a/chakra-init-live/chakra-init-live.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - echo "Enabling systemd services" - systemctl enable upower.service - systemctl enable udisks.service - systemctl enable avahi-daemon.service - systemctl enable NetworkManager.service - systemctl enable kdm.service - systemctl enable ntpd.service - systemctl enable bluetooth.service -} - -post_upgrade() { - post_install -} diff --git a/chakra-init-live/live b/chakra-init-live/live deleted file mode 100755 index 405d244d7..000000000 --- a/chakra-init-live/live +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# kernel_cmdline -# Looks for a parameter on the kernel's boot-time command line. -# -# returns: 0 if param was found. Also prints its value if it was a K=V param. -# 1 if it was not. Also prints value passed as -# -kernel_cmdline () -{ - for param in $(/bin/cat /proc/cmdline); do - case "${param}" in - $1=*) echo "${param##*=}"; return 0 ;; - $1) return 0 ;; - *) continue ;; - esac - done - [ -n "${2}" ] && echo "${2}" - return 1 -} - -LOCALE="$(kernel_cmdline locale.LANG en_US.utf8)" -TIMEZONE="$(kernel_cmdline timezone UTC)" -KEYMAP="$(kernel_cmdline vconsole.keymap us)" -CONSOLEFONT="$(kernel_cmdline vconsole.font)" -CONSOLEMAP="$(kernel_cmdline vconsole.font.map)" -USENONFREE="$(kernel_cmdline nonfree no)" - -#Polkit issue, reinstall needed? -#pacman -Udf --noconfirm /opt/chakra/pkgs/polkit* &>/dev/null -#systemctl --system daemon-reload -#systemctl reload dbus.service -#systemctl start polkit.service -#systemctl stop NetworkManager.service -#systemctl start NetworkManager.service - -#edit /etc/environment -echo "LANG=${LOCALE}" >> /etc/environment - -source /etc/locale_setup.sh # imports get_bootparam_value, get_country and - #set_locale - -set_locale # sets locale settings and hwclock - -#Hardware detection -/opt/chakra/bin/hwdetect - -#Detecting drivers -/opt/chakra/bin/xorg-detect - -#Adjusting xorg config file -/opt/chakra/bin/xorg-config - -#do_configsforroot -cp -a /etc/skel/. /root/ - -# set correct permissions for live user -chown -R live:users /home/live -# fix sudoers file -chown root:root /etc/sudoers -chmod 0440 /etc/sudoers - -# misc exports -export KDE_NO_IPV6="TRUE" -export OPERAPLUGINWRAPPER_PRIORITY=0 - -# in case proprietary drivers load takes longer -systemctl restart kdm.service - - diff --git a/chakra-init-live/locale_setup.sh b/chakra-init-live/locale_setup.sh deleted file mode 100644 index 055cbaceb..000000000 --- a/chakra-init-live/locale_setup.sh +++ /dev/null @@ -1,369 +0,0 @@ -#!/bin/bash -# This is a work in progress, especially locale.gen needs to be adjusted - - -# $1: the parameter whose value you want to get -# returns: the value of the parameter, if existant -get_bootparam_value() -{ - [ -z "$CMDLINE" ] && CMDLINE="$(< /proc/cmdline)" - case "$CMDLINE" in *\ $1=*) ;; *) return 1; ;; esac - local result="${CMDLINE##*$1=}" - echo ${result%%[ ]*} -} - -# returns: the country of the user, if set as kernel parameter -# depends: get_bootparam_value -get_country() -{ - local COUNTRY=`get_bootparam_value lang` - echo $COUNTRY -} - -# depends: get_country -# returns: nothing -# sets the locale as well as timezone and keymap -# TODO only locale working so far -set_locale() { - # hack to be able to set the locale on bootup - # - local COUNTRY=$(get_country) - [ -n "$COUNTRY" ] || COUNTRY="enus" - - # set a default value, in case something goes wrong, or a language doesn't have - # good defult settings - # comment out all locales which we don't need - sed -i "s/^/#/g" /etc/locale.gen - local LOCALE="en_US.utf8" - local LC_MESSAGE="C" - local HARDWARECLOCK="UTC" - local TIMEZONE="Canada/Pacific" - # copy the keyboard.conf file to it's place - cp -f /etc/skel/10-keyboard.conf /etc/X11/xorg.conf.d/10-keyboard.conf - case "$COUNTRY" in - ast) - # Asturian - LOCALE="ast_ES.utf8" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - at) - # Austrian - LOCALE="de_AT.utf8" - TIMEZONE="Europe/Vienna" - KEYMAP="de" - XKEYMAP="de" - sed -i "/XkbLayout/ s/us/"de"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - be) - # Belarusian - LOCALE="be_BY.utf8" - TIMEZONE="Europe/Brussels" - KEYMAP="be" - XKEYMAP="be" - sed -i "/XkbLayout/ s/us/"be"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - bg) - # Bulgarian - LOCALE="bg_BG.utf8" - TIMEZONE="Europe/Sofia" - KEYMAP="bg" - XKEYMAP="bg" - sed -i "/XkbLayout/ s/us/"bg"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - ca) - # Catalan - LOCALE="ca_ES.utf8" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - cs) - # Czech - LOCALE="cs_CZ.utf8" - TIMEZONE="Europe/Prague" - KEYMAP="cz-lat2" - XKEYMAP="cz" - sed -i "/XkbLayout/ s/us/"cz"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - de) - # German - LOCALE="de_DE.utf8" - TIMEZONE="Europe/Berlin" - KEYMAP="de" - XKEYMAP="de" - sed -i "/XkbLayout/ s/us/"de"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - dk) - # Danish - LOCALE="da_DK.utf8" - TIMEZONE="Europe/Copenhagen" - KEYMAP="dk" - XKEYMAP="dk" - sed -i "/XkbLayout/ s/us/"dk"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - el) - # Greek - LOCALE="el_GR.utf8" - TIMEZONE="Europe/Athens" - KEYMAP="el" - XKEYMAP="el" - sed -i "/XkbLayout/ s/us/"el"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - engb) - # British - LOCALE="en_GB.utf8" - TIMEZONE="Europe/London" - KEYMAP="gb" - XKEYMAP="uk" - sed -i "/XkbLayout/ s/us/"gb"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - ennz) - # New Zealand - LOCALE="en_NZ.utf" - HARMEZONE="Pacific/Auckland" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - enus) - # English - LOCALE="en_US.utf8" - TIMEZONE="Canada/Pacific" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - es) - # Spain - LOCALE="es_ES.utf8" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - esar) - # Argetina - LOCALE="es_AR.utf8" - TIMEZONE="America/Argentina" - KEYMAP="la-latin1" - XKEYMAP="la-latin1" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - eu) - # Basque - LOCALE="eu_ES.utf8" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - fi) - # Finland - LOCALE="fi_FI.utf8" - TIMEZONE="Europe/Helsinki" - KEYMAP="fi" - XKEYMAP="fi" - sed -i "/XkbLayout/ s/us/"fi"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - fr) - # France - LOCALE="fr_FR.utf8" - TIMEZONE="Europe/Paris" - KEYMAP="fr" - XKEYMAP="fr" - sed -i "/XkbLayout/ s/us/"fr"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - gl) - # Galician - LOCALE="gl_ES.utf8" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - hu) - # Hungary - LOCALE="hu_HU.utf8" - TIMEZONE="Europe/Budapest" - KEYMAP="hu" - XKEYMAP="hu" - sed -i "/XkbLayout/ s/us/"hu"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - hr) - # Croatian - LOCALE="hr_HR.utf8" - TIMEZONE="Europe/Zagreb" - KEYMAP="hr" - XKEYMAP="hr" - sed -i "/XkbLayout/ s/us/"hr"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - it) - # Italy - LOCALE="it_IT.utf8" - TIMEZONE="Europe/Rome" - KEYMAP="it" - XKEYMAP="it" - sed -i "/XkbLayout/ s/us/"it"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - ja) - # Japanese - LOCALE="ja_JP.utf8" - TIMEZONE="Asia/Tokyo" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - nl) - # Dutch - LOCALE="nl_NL.utf8" - TIMEZONE="Europe/Amsterdam" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - nlbe) - # Belgium - LOCALE="nl_BE.utf8" - TIMEZONE="Europe/Brussels" - KEYMAP="be" - XKEYMAP="be" - sed -i "/XkbLayout/ s/us/"be"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - no) - # Norway - LOCALE="nb_NO.utf8" - TIMEZONE="Europe/Oslo" - KEYMAP="no" - XKEYMAP="no" - sed -i "/XkbLayout/ s/us/"no"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - pl) - # Poland - LOCALE="pl_PL.utf8" - TIMEZONE="Europe/Warsaw" - KEYMAP="pl" - XKEYMAP="pl" - CONSOLEFONT="lat2-16.psfu.gz" - sed -i "/XkbLayout/ s/us/"pl"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - ptbr) - # Brazilian Portuguese - LOCALE="pt_BR.utf8" - TIMEZONE="America/Sao_Paulo" - KEYMAP="br-abnt2" - XKEYMAP="pt" - sed -i "/XkbLayout/ s/us/"br"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - ru) - # Russia - LOCALE="ru_RU.utf8" - TIMEZONE="Europe/Moscow" - KEYMAP="ru" - XKEYMAP="ru" - sed -i "/XkbLayout/ s/us/"ru"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - sk) - # Slovak - LOCALE="sk_SK.utf8" - TIMEZONE="Europe/Bratislava" - KEYMAP="sk" - XKEYMAP="sk" - sed -i "/XkbLayout/ s/us/"sk"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - sl) - # Slovenian - LOCALE="sl_SI.utf8" - TIMEZONE="Europe/Ljubljana" - KEYMAP="slovene" - XKEYMAP="si" - sed -i "/XkbLayout/ s/us/"si"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - sr) - # Serbian - LOCALE="sr_RS.utf8" - TIMEZONE="Europe/Belgrade" - KEYMAP="sr" - XKEYMAP="sr" - sed -i "/XkbLayout/ s/us/"sr"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - sv) - # Swedish - LOCALE="sv_SE.utf8" - TIMEZONE="Europe/Stockholm" - KEYMAP="se" - XKEYMAP="se" - sed -i "/XkbLayout/ s/us/"se"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - tr) - # Turkish - LOCALE="tr_TR.utf8" - TIMEZONE="Europe/Istanbul" - KEYMAP="tr" - XKEYMAP="trq" - sed -i "/XkbLayout/ s/us/"tr"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - vcia) - # Catalan (valencia) - LOCALE="ca_ES.utf8@valencia" - TIMEZONE="Europe/Madrid" - KEYMAP="es" - XKEYMAP="es" - sed -i "/XkbLayout/ s/us/"es"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - zhcn) - # Simplified Chinese - LOCALE="zh_CN.utf8" - TIMEZONE="Asia/Shanghai" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - zhhk) - # Traditional Chinese (Hong Kong) - LOCALE="zh_HK.utf8" - TIMEZONE="Asia/Hong Kong" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - zhtw) - # Traditional Chinese (Taiwan) - LOCALE="zh_TW.utf8" - TIMEZONE="Asia/Taipei" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - *) - # American - LOCALE="en_US.utf8" - TIMEZONE="Canada/Pacific" - KEYMAP="us" - XKEYMAP="us" - sed -i "/XkbLayout/ s/us/"us"/" /etc/X11/xorg.conf.d/10-keyboard.conf - ;; - esac - # the following sed line uncomments the line corresponding to the users language - # in /etc/locale.gen - # -i -r: edit inplace, use extended regex; $TLANG is the language variable - # match outcommented lines containing the language and UTF-8, store everything - # except the # in a group and replace it with this group (that's the \1) - local TLANG=${LOCALE%.*} # remove everything after the ., including the dot from LOCALE - sed -i -r "s/#(.*${TLANG}.*UTF-8)/\1/g" /etc/locale.gen - sed -i -r "s/#(en_US.*UTF-8)/\1/g" /etc/locale.gen - echo "LANG=$LOCALE" > /etc/locale.conf - echo "LC_MESSAGES=$LOCALE" >> /etc/locale.conf - # generate LOCALE - locale-gen - - #--------------locale is now set up, now setting up timezone---------------# - # set timezone - ln -s /usr/share/zoneinfo/${TIMEZONE} /etc/localtime - # set hardware clock to utc - #TODO should this be changed when we detect Windows? - hwclock --systohc --utc -} diff --git a/kde-workspace/02_sane_env_and_shutdown_path.patch b/kde-workspace/02_sane_env_and_shutdown_path.patch deleted file mode 100644 index 1e501c004..000000000 --- a/kde-workspace/02_sane_env_and_shutdown_path.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 -+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 -@@ -34,22 +34,6 @@ - MALLOC_CHECK_=2 - export MALLOC_CHECK_ - --# in case we have been started with full pathname spec without being in PATH --bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` --if [ -n "$bindir" ]; then -- qbindir=`$bindir/kde4-config --qt-binaries` -- if [ -n "$qbindir" ]; then -- case $PATH in -- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; -- *) PATH=$qbindir:$PATH; export PATH;; -- esac -- fi -- case $PATH in -- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; -- *) PATH=$bindir:$PATH; export PATH;; -- esac --fi -- - # Boot sequence: - # - # kdeinit is used to fork off processes which improves memory usage -@@ -206,7 +190,7 @@ - # For anything else (that doesn't set env vars, or that needs a window manager), - # better use the Autostart folder. - --libpath=`kde4-config --path lib | tr : '\n'` -+libpath=`kde4-config --path lib | tr : '\n'`'\n/etc/kde/lib/' - - for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do - for file in "$prefix"*.sh; do diff --git a/partitionmanager/PKGBUILD b/partitionmanager/PKGBUILD index ddaf87bdd..438c66d8b 100644 --- a/partitionmanager/PKGBUILD +++ b/partitionmanager/PKGBUILD @@ -1,16 +1,15 @@ # # Chakra Packages for Chakra, part of chakra-project.org # -# maintainer (i686): Phil Miller -# maintainer (x86_64): Manuel Tortosa +# maintainer abveritas[at]chakra-project[dot]org> # include global config source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=partitionmanager -pkgver=1257912 +pkgver=1330962 pkgrel=1 -arch=('i686' 'x86_64') +arch=('x86_64') url="https://sourceforge.net/projects/partitionman" license=('GPL2') depends=('kdebase-runtime' 'parted' 'libatasmart') @@ -23,8 +22,6 @@ optdepends=('e2fsprogs: ext2/3/4 support' 'dosfstools: FAT32 support') categories=('system') install=partitionmanager.install -#source=(tribe.patch) # disable-gpt.patch) -#md5sums=('315e17fcc5c6e8e64902f0d3385f3c9f') # '30c6cdf25c23c6fc33c21b3b48b28ed0') #_svntrunk=svn://anonsvn.kde.org/home/kde/trunk/extragear/sysadmin/partitionmanager _svnmod=partitionmanager-svn