- Arch-projects - lists.archlinux.org

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.2
by tomegun＠archlinux.org 26 Jul '11

26 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 76b5afd054d73b5c22eb7ee36e081eca40395457 (commit) via 91cd22c4fbbeabb4f64571511a009c572a9bb120 (commit) via ff59fce20fb27911fca66c6f6574056365917fa1 (commit) from 895d0944e622aac9a9446e6f727dadd07370677c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 76b5afd054d73b5c22eb7ee36e081eca40395457 Merge: ff59fce 91cd22c Author: Tom Gundersen <teg(a)jklm.no> Date: Tue Jul 26 19:40:12 2011 +0200 Merge remote-tracking branch 'falconindy/working' commit 91cd22c4fbbeabb4f64571511a009c572a9bb120 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 26 00:22:37 2011 -0400 tmpfiles.conf: fix improper creation of /var/run/utmp Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ff59fce20fb27911fca66c6f6574056365917fa1 Author: Sebastien Luttringer <seblu(a)seblu.net> Date: Tue Jul 26 01:33:38 2011 +0200 Add /etc/tmpfiles.d into makefile This add a /etc/tmpfiles.d inside makefile to automatically create directory with package. /etc is a better place to store user specific tmpfiles config where /usr/lib is better for shipped with package config. As Dave as already included this path inside his arch-tmpfiles, it would be a shame to miss out. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> ----------------------------------------------------------------------- Summary of changes: Makefile | 1 + tmpfiles.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [mkinitcpio][PATCH] tmpfiles.conf: fix improper creation of /var/run/utmp
by Dave Reisner 26 Jul '11

26 Jul '11

Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- tmpfiles.conf | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tmpfiles.conf b/tmpfiles.conf index f7db5a0..7dd1358 100644 --- a/tmpfiles.conf +++ b/tmpfiles.conf @@ -11,7 +11,7 @@ d /tmp/.XIM-unix 1777 root root d /tmp/.font-unix 1777 root root d /tmp/.Test-unix 1777 root root -f /var/run/tmp 0664 root utmp +F /var/run/utmp 0664 root utmp r /tmp/.X[0-9]-lock r /etc/nologin -- 1.7.6

1 1

[arch-projects] [INITSCRIPTS][PATCH] Add /etc/tmpfiles.d into makefile
by Sebastien Luttringer 25 Jul '11

25 Jul '11

This add a /etc/tmpfiles.d inside makefile to automatically create directory with package. /etc is a better place to store user specific tmpfiles config where /usr/lib is better for shipped with package config. As Dave as already included this path inside his arch-tmpfiles, it would be a shame to miss out. Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 9fd2347..b2256ec 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,7 @@ DIRS := \ /etc/rc.d/functions.d \ /etc/logrotate.d \ /sbin \ + /etc/tmpfiles.d \ /usr/lib/tmpfiles.d \ /usr/lib/initscripts \ /etc/bash_completion.d \ -- Sebastien "Seblu" Luttringer

2 1

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.07.1 created. 2011.07.1
by tomegun＠archlinux.org 25 Jul '11

25 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The annotated tag, 2011.07.1 has been created at 5004e3def1dc5116a4a5fea624ea5ce50caa3a07 (tag) tagging 895d0944e622aac9a9446e6f727dadd07370677c (commit) replaces 2011.06.3 tagged by Tom Gundersen on Mon Jul 25 21:32:01 2011 +0200 - Log ----------------------------------------------------------------- Changes to rc.conf ------------------ The VERBOSE parameter no longer has an effect, use the kernel's loglevel= parameter instead. Most people probably wants to pass 'quiet' to the kernel. If HARDWARECLOCK is empty we will read the value of UTC/LOCAL from hwclock's adjfile instead. To avoid interacting with the hardwareclock set HARDWARECLOCK="IGNORE". We now support (optionally) setting the broadcast address in the new network config. Behavioral changes ------------------ We no longer silence errors thrown by udev. In particular, if udevadm --settle times out, we get an error message. We no longer adjust the rtc on boot, as it is unreliable, we only make corrections for the timezone. We no longer mount /run as noexec. Misc changes ------------ Cleaning up of /tmp and friends is now done by an external tool. This tool is intended to allow pac kages to maintain {/var,}/run{/lock,} in the absense of rc scripts. General refactoring which should make maintenance and writing custom hooks easier. Andrwe Lord Weber (1): added get_pid() and ck_pidfile() (FS#18654) Dave Reisner (16): rc.sysinit: kill off VERBOSE= parameter rc.sysinit: allow exec in /run rc.d/rc.sysinit: whitespace cleanup use $() instead of `` for command substitutions add PATH, strip absolute path from binaries remove absolute paths from daemons and rc.d rc.sysinit: honor blacklist, not load_modules network: support gateway-less network setup rc.sysinit: avoid use of regex match for USE* vars network: don't enforce check for netmask or gateway rc.shutdown: continuation of fe48fab2c2c35c network: always warn about deprecation for old funcs network: don't warn for deprecation with no settings arch-tmpfiles: add new script to handle volatile file control arch-tmpfiles: check args, warn on invalid entries arch-tmpfiles: add cmdline parameters Eric Bélanger (3): Clean up ANSI codes from /var/log/boot Removed superfluous dollar sign Add logrotate config file to rotate /var/log/boot Gerardo Exequiel Pozzi (4): [initscripts] Avoid error message when switch runlevels. [initscripts] chmod dmesg.log based on value from dmesg_restrict Be consistent (with mkinitcpio) source naming of /run [initscripts] network: Add missing broadcast address Jacob Okamoto (1): rc.d: clear text formatting after error Kurt J. Bosch (68): Move fsck stuff into functions to allow custom overrides (FS#18736) Simplify fsck functions Allow custom fsck on shutdown via hook (FS#18736) Move mount -a into functions to allow custom override (fsck on loop) Fix hwclock comments Simplify timezone copying Simplify creating files by using /bin/install Simplify keyboard map loading by using loadkeys autodetection Simplify API filesystems mounting Some cosmetics Simplify rc.single udevadm stuff as in rc.sysinit Simplify unmounting filesystems rc.single: Avoid rc.multi syslog start error - use minilogd as in rc.sysinit Fix bootlogd not stopped when booting into runlevel '1' Simplify random seed file creation Some more cosmetics Simplify in_array function rc.sysinit/rc.single: Merge UDev stuff into a function rc.multi/rc.single: Merge duplicated bootlogd stop code into a function Get rid of simple if-constucts by using '&&' Simplify /etc/profile.d/locale.sh creation Fix whitespace functions: Fix indentation rc.sysinit: Fix writing to /dev/urandom rc.sysinit: Fix setting locale Fix '>|' not used allways when redirecting to files Fix local statements missing in ck_depends, ck_pidfile, do_unlock, kill_everything functions: Define $fsckret read-only because exposed to hook Add some comments functions: Simplify ck_depends() for statement functions: Simplify kill_everything() omit_pid handling Refactor to get rid of simple if-constucts rc.sysinit: Get rid of eval Move fsck executable check into fsck_all() for consistency Move activate_vgs and crypt stat_busy to the top for consistency functions: Make activate_vgs return 0 if noop for consistency Move export PATH into functions rc.sysinit: Refactor /etc/mtab symlink detection to avoid empty if clause rc.sysinit: Add status output for mtab and dmesg.log creation functions/rc.single: Clean up whitespace rc.sysinit: Fix stat_busy block indentation functions: Get rid of superfluous braces in udevd_modprobe() functions: Add missing quotes in mount_all() functions/rc.multi: Strip paths from binaries Refactor kill_everything, fsck_all and mount_all code rc.sysinit: Declare $FORCEFSCK read-only functions/rc.sysinit: Refactor fsck-redirection to prevent breakage rc.sysinit: Remove unneeded variables initializations functions: Make status() return the actual exit code functions: Speed up reboot/shutdown by recognizing killall5 exit code 2 netfs: cleanup whitespace netfs: Strip paths from binaries netfs: Refactor to provide meaningful exit code functions/netfs: Refactor filesystem type lists and $NETFS rc.sysinit: Simplify /var/run/daemons workaround rc.single: Remove $PATH assignment rc.sysinit: fixup fsck refactoring functions: Use ck_autostart in stop_all_daemons() functions: Make in_array() non DAEMONS specific rc.sysinit: Fix /tmp/.* pattern functions/rc.sysinit: Refactor 'Removing Leftover Files' code rc.single: Call remove_leftover() when going single-user functions: Remove useless '$' within '(( ))' functions: Unify whitespace inside '(( ))' Fix/unify quoting functions: Cosmetics: Refactor usage of local daemon variables rc.sysinit: Move 'run_hook sysinit_start' after mount root read-only rc.shutdown: Move 'run_hook shutdown_start' after "Initiating Shutdown..." Sebastien Luttringer (6): rc.d: Update usage rc.d: Add started/stopped option to list rc.d: Update bash and zsh completion scripts Ensure rc.d scripts are run as root Use _get_comp_words_by_ref in bash completion Remove usage of head in PKGBUILD Tom Gundersen (20): Merge remote-tracking branch 'falconindy/working' udev: don't silence settle + trivial hwclock: allow TZ to be set in adjtime, only adjust for TZ during boot hwclock: refactor daemon udev: remove rule generation Merge remote-tracking branch 'djgera/djgera' Merge branch 'snowman' hostname: echo to kernel directly Merge remote-tracking branch 'djgera/djgera' Merge remote-tracking branch 'seblu/master' status: adjust number of columns after loading modules Merge remote-tracking branch 'falconindy/working' functions: warn if daemons are started recursively trivial: silence errors hwclock: use correct timezone hwclock: show status Merge remote-tracking branch 'seblu/master' Merge remote-tracking branch 'seblu/master' Merge remote-tracking branch 'kujub/master' network: reword depracation message derhoch (1): changing _rd.d to _rc_d to avoid: jofko (1): Adding hook sysinit_postmount ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.07.1
by tomegun＠archlinux.org 25 Jul '11

25 Jul '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 895d0944e622aac9a9446e6f727dadd07370677c (commit) via 370dd6573143fb9b9a7d368badbd3f2bb40ad6cf (commit) via 7e39dc717edd4690772059ad4d5a7550dbf65019 (commit) from 97f84c28e969920cac8700fe6d12c51aca32d257 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 895d0944e622aac9a9446e6f727dadd07370677c Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Jul 25 21:31:19 2011 +0200 network: reword depracation message Make it clear that the message refers to network settings, as some users found this confusing. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 370dd6573143fb9b9a7d368badbd3f2bb40ad6cf Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 24 15:04:36 2011 -0400 arch-tmpfiles: add cmdline parameters Categorize actions as 'create' or 'remove', for finer control. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7e39dc717edd4690772059ad4d5a7550dbf65019 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 24 11:05:36 2011 -0400 arch-tmpfiles: check args, warn on invalid entries Introduces the checkparams functions, which thoroughly checks arguments for presence, length, and some amount of data validation. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: arch-tmpfiles | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++------ functions | 2 +- network | 2 +- tmpfiles.conf | 18 ++++---- 4 files changed, 117 insertions(+), 23 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [dbscripts] [PATCH 1/2] Make tests much more portable and usable
by Dan McGee 25 Jul '11

25 Jul '11

Using 'sudo' in a test? Not on my machine, I don't care how secure it should be, it is totally unnecessary, not to mention the annoyance of password prompts, needing the chroot setups, etc. Instead, use makepkg directly along with some very vanilla makepkg.conf config files to do the work. This makes for a more reproducable environment as far as makepkg settings goes. Also adjust the package building code in common.inc to be a bit more straightforward. Remove the need for three seperate loops, and only ever copy packages in one direction (from the local test directory to the /dev/shm/ staging area). With these changes, I didn't have too many problems running the test suite locally on my box after cloning the repository. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- test/lib/common.inc | 54 ++++++++++++++++++++------------------- test/lib/makepkg.i686.conf | 10 +++++++ test/lib/makepkg.x86_64.conf | 10 +++++++ test/test.d/db-update.sh | 6 +++- test/test.d/pool-transition.sh | 3 +- test/test.d/testing2x.sh | 3 +- 6 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 test/lib/makepkg.i686.conf create mode 100644 test/lib/makepkg.x86_64.conf diff --git a/test/lib/common.inc b/test/lib/common.inc index eb46508..a2ba1e0 100644 --- a/test/lib/common.inc +++ b/test/lib/common.inc @@ -10,39 +10,39 @@ oneTimeSetUp() { local pkgname local pkgarch local pkgversion - local build + origindir="$(dirname ${BASH_SOURCE[0]})/../packages" pkgdir="$(mktemp -d /dev/shm/$(basename $0).XXXXXXXXXX)" - cp -Lr $(dirname ${BASH_SOURCE[0]})/../packages/* "${pkgdir}" - msg 'Building packages...' - for d in "${pkgdir}"/*; do - pushd $d >/dev/null - pkgname=($(. PKGBUILD; echo ${pkgname[@]})) - pkgarch=($(. PKGBUILD; echo ${arch[@]})) - pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) - - build=true - for a in ${pkgarch[@]}; do - for p in ${pkgname[@]}; do - [ ! -f ${p}-${pkgversion}-${a}${PKGEXT} ] && build=false - done - done - if ! ${build}; then + if [ -f ${origindir}/packages-built ]; then + msg 'Using existing packages.' + else + msg 'Building packages...' + for d in "${origindir}"/*; do + pushd $d >/dev/null + pkgname=($(. PKGBUILD; echo ${pkgname[@]})) + pkgarch=($(. PKGBUILD; echo ${arch[@]})) + pkgversion=$(. PKGBUILD; echo $(get_full_version ${epoch:-0} ${pkgver} ${pkgrel})) + + PKGDEST=$(pwd) + export PKGDEST + echo $PKGDEST if [ "${pkgarch[0]}" == 'any' ]; then - sudo extra-x86_64-build || die 'extra-x86_64-build failed' + MAKEPKG_CONF="$(dirname ${BASH_SOURCE[0]})/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" else for a in ${pkgarch[@]}; do - sudo extra-${a}-build || die "extra-${a}-build failed" + MAKEPKG_CONF="$(dirname ${BASH_SOURCE[0]})/makepkg.$a.conf" + makepkg --force --config "$MAKEPKG_CONF" done fi - for a in ${pkgarch[@]}; do - for p in ${pkgname[@]}; do - cp ${p}-${pkgversion}-${a}${PKGEXT} $(dirname ${BASH_SOURCE[0]})/../packages/$(basename ${d}) - done - done - fi - popd >/dev/null - done + popd >/dev/null + done + + touch ${origindir}/packages-built + fi + + cp -Lr "${origindir}"/* "${pkgdir}" + rm "${pkgdir}"/packages-built } oneTimeTearDown() { @@ -229,3 +229,5 @@ checkRemovedAnyPackage() { [ -d "${TMP}/svn-packages-copy/${pkgbase}/repos/${repo}-any" ] \ && fail "svn-packages-copy/${pkgbase}/repos/${repo}-any should not exist" } + +# vim: syntax=sh: diff --git a/test/lib/makepkg.i686.conf b/test/lib/makepkg.i686.conf new file mode 100644 index 0000000..6fae31e --- /dev/null +++ b/test/lib/makepkg.i686.conf @@ -0,0 +1,10 @@ +# /etc/makepkg.conf + +CARCH="i686" + +BUILDENV=(fakeroot !distcc color !ccache check !sign) +OPTIONS=(strip docs libtool emptydirs zipman purge) + +INTEGRITY_CHECK=(md5) +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' diff --git a/test/lib/makepkg.x86_64.conf b/test/lib/makepkg.x86_64.conf new file mode 100644 index 0000000..cdee1d7 --- /dev/null +++ b/test/lib/makepkg.x86_64.conf @@ -0,0 +1,10 @@ +# /etc/makepkg.conf + +CARCH="x86_64" + +BUILDENV=(fakeroot !distcc color !ccache check !sign) +OPTIONS=(strip docs libtool emptydirs zipman purge) + +INTEGRITY_CHECK=(md5) +PKGEXT='.pkg.tar.xz' +SRCEXT='.src.tar.gz' diff --git a/test/test.d/db-update.sh b/test/test.d/db-update.sh index e38c328..5db276b 100755 --- a/test/test.d/db-update.sh +++ b/test/test.d/db-update.sh @@ -82,7 +82,8 @@ testUpdateAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null @@ -100,7 +101,8 @@ testUpdateAnyPackageToDifferentRepositoriesAtOnce() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null diff --git a/test/test.d/pool-transition.sh b/test/test.d/pool-transition.sh index 5873f00..545c2a5 100755 --- a/test/test.d/pool-transition.sh +++ b/test/test.d/pool-transition.sh @@ -63,7 +63,8 @@ testUpdateAnyPackageWithoutPool() { pushd "${TMP}/svn-packages-copy/${pkgname}/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv "${pkg2}" "${pkgdir}/${pkgname}/" popd >/dev/null diff --git a/test/test.d/testing2x.sh b/test/test.d/testing2x.sh index eda6cd6..bcc1b9d 100755 --- a/test/test.d/testing2x.sh +++ b/test/test.d/testing2x.sh @@ -10,7 +10,8 @@ testTesting2xAnyPackage() { pushd "${TMP}/svn-packages-copy/pkg-any-a/trunk/" >/dev/null sed 's/pkgrel=1/pkgrel=2/g' -i PKGBUILD svn commit -q -m"update pkg to pkgrel=2" >/dev/null - sudo extra-i686-build >/dev/null 2>&1 + MAKEPKG_CONF="${curdir}/../lib/makepkg.i686.conf" + makepkg --force --config "$MAKEPKG_CONF" mv pkg-any-a-1-2-any.pkg.tar.xz "${pkgdir}/pkg-any-a/" popd >/dev/null -- 1.7.6

3 3

[arch-projects] [devtools] [PATCH] makechrootpkg: support absolute paths for chroot copy
by Florian Pritz 25 Jul '11

25 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- makechrootpkg | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index 90c60c5..52071c2 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -74,8 +74,12 @@ done # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$chrootdir") -[[ -z $copy ]] && copy=$default_copy -copydir="$chrootdir/$copy" +if [[ ${copy:0:1} = "/" ]]; then + copydir=$copy +else + [[ -z $copy ]] && copy=$default_copy + copydir="$chrootdir/$copy" +fi # Pass all arguments after -- right to makepkg MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}" -- 1.7.6

1 0

[arch-projects] [devtools] [PATCH 1/2] archrelease: add repos/ directory if it doesn't exist
by Dan McGee 25 Jul '11

25 Jul '11

Very easy thing to forget when creating a new package, but easy enough to check for and add automatically. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- archrelease | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/archrelease b/archrelease index 8ea718c..baaf6cf 100755 --- a/archrelease +++ b/archrelease @@ -29,6 +29,10 @@ if [ -d "repos/${1}" ]; then svn rm --force -q "repos/${1}" svn commit -q -m "archrelease: remove ${1}" || abort fi +if [ ! -d repos ]; then + mkdir repos + svn add repos +fi svn copy -q -r HEAD "${trunk}" "repos/${1}" svn commit -q -m "archrelease: copy ${trunk} to ${1}" || abort popd >/dev/null -- 1.7.6

3 4

[arch-projects] [PATCH] [devtools] Edit /etc/locale.gen instead of overwrite.
by Gerardo Exequiel Pozzi 25 Jul '11

25 Jul '11

I need this for archiso, instead of maintaining a private copy. Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- mkarchroot | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkarchroot b/mkarchroot index f385731..7a7fbbe 100755 --- a/mkarchroot +++ b/mkarchroot @@ -220,7 +220,7 @@ else fi if [ -e "${working_dir}/etc/locale.gen" ]; then - echo -e 'en_US.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8' > "${working_dir}/etc/locale.gen" + sed -i 's@^#$en_US\|de_DE$$\.UTF-8$@\1\2@' "${working_dir}/etc/locale.gen" chroot "${working_dir}" locale-gen fi -- 1.7.5.2

3 2

[arch-projects] [devtools][PATCH] add -n option to community/archco to create new packages
by Florian Pritz 24 Jul '11

24 Jul '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile | 2 +- archco | 41 +++++++++++++++++++++++++++++++++++++++-- communityco | 10 ---------- 3 files changed, 40 insertions(+), 13 deletions(-) delete mode 100755 communityco diff --git a/Makefile b/Makefile index 8772bc0..27cefba 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,6 @@ BINPROGS = \ checkpkg \ commitpkg \ archco \ - communityco \ archrelease \ archrm \ archbuild \ @@ -57,6 +56,7 @@ install: install -m0644 ${CONFIGFILES} $(DESTDIR)/usr/share/devtools for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)/usr/bin/$$l; done for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)/usr/bin/$$l; done + ln -sf archco $(DESTDIR)/usr/bin/communityco install -Dm0644 bash_completion $(DESTDIR)/etc/bash_completion.d/devtools uninstall: diff --git a/archco b/archco index 5fc9ebe..098cf31 100755 --- a/archco +++ b/archco @@ -1,10 +1,47 @@ #!/bin/bash +scriptname=${0##*/} +CREATE= +STARTDIR=$PWD + if [ "$1" = '' ]; then - echo 'Usage: archco <package name> [<package name>]' + echo 'Usage: '$scriptname' [options] <package name> [<package name>]' + echo "Options:" + echo " -n create new packages and check them out" exit 1 fi +case $scriptname in + archco) + SVNURL="svn+ssh://gerolde.archlinux.org/srv/svn-packages";; + communityco) + SVNURL="svn+ssh://aur.archlinux.org/srv/svn-packages";; + *) + echo "error: couldn't find svn url for $scriptname" + exit 1 + ;; +esac + +if [[ $1 = "-n" ]]; then + CREATE=1 + shift + + TMPDIR=$(mktemp -d /tmp/$scripname.XXXXXXXX) + trap "rm -rf $TMPDIR" EXIT INT TERM + + cd $TMPDIR + svn checkout -N "$SVNURL" svn + +fi + for i in "$@"; do - svn co svn+ssh://gerolde.archlinux.org/srv/svn-packages/$i + if (($CREATE)); then + cd $TMPDIR/svn + mkdir -p "$i/"{repos,trunk} + svn add "$i" + svn commit -m "add new package: $i" + cd $STARTDIR + fi + + svn co "$SVNURL/$i" done diff --git a/communityco b/communityco deleted file mode 100755 index 0909db1..0000000 --- a/communityco +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ "$1" = '' ]; then - echo 'Usage: communityco <package name> [<package name>]' - exit 1 -fi - -for i in "$@"; do - svn co svn+ssh://aur.archlinux.org/srv/svn-packages/$i -done -- 1.7.6

1 0