diff options
| author | Cecil <knoppmyth@gmail.com> | 2011-07-30 02:29:01 (GMT) |
|---|---|---|
| committer | Cecil <knoppmyth@gmail.com> | 2011-07-30 02:29:01 (GMT) |
| commit | c138ef2c1d307572e1e63bc1da5b64ab9f49a92a (patch) | |
| tree | 32bb56f3566e68b42cc175aaef24e6fa4f501db7 | |
| parent | 863d738101a4df830a10052b567e835f42bbcf46 (diff) | |
| parent | a5f29802fb46591e72d3291bf9896e142bcdab8a (diff) | |
| download | linhes_dev-c138ef2c1d307572e1e63bc1da5b64ab9f49a92a.zip | |
Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_dev into testing
3 files changed, 3 insertions, 3 deletions
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/pacman.conf.options index d71f787..de6faee 100644 --- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/pacman.conf.options +++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/pacman.conf.options @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled -Architecture = auto +Architecture = i686 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/pacman.conf.options index d71f787..de6faee 100644 --- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/pacman.conf.options +++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/pacman.conf.options @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled -Architecture = auto +Architecture = i686 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/pacman.conf.options b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/pacman.conf.options index d71f787..de6faee 100644 --- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/pacman.conf.options +++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/pacman.conf.options @@ -19,7 +19,7 @@ SyncFirst = pacman #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #XferCommand = /usr/bin/curl -C - %u > %o #CleanMethod = KeepInstalled -Architecture = auto +Architecture = i686 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup #IgnorePkg = |