diff options
| author | Cecil <knoppmyth@gmail.com> | 2012-05-14 03:03:57 (GMT) |
|---|---|---|
| committer | Cecil <knoppmyth@gmail.com> | 2012-05-14 03:03:57 (GMT) |
| commit | e2f93de5597f7422cd4b3dd85aeec1f6c0ae2080 (patch) | |
| tree | ed30bc597efd9cafc38f2a2cddb9ce4c60d073d5 /build_tools/bin | |
| parent | a12460152dcebf2c342f5a3596769977453068ae (diff) | |
| parent | 699a628f97e313f0b0b53d55b1ad9d6a647277cd (diff) | |
| download | linhes_dev-e2f93de5597f7422cd4b3dd85aeec1f6c0ae2080.zip | |
Merge branch 'testing' of git@linhes.org:linhes_dev into testing
Conflicts:
build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
Diffstat (limited to 'build_tools/bin')
| -rwxr-xr-x | build_tools/bin/check_repo.sh | 2 | ||||
| -rwxr-xr-x | build_tools/bin/check_repo/alpm.so | bin | 5070 -> 5050 bytes | |||
| -rwxr-xr-x | build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so | bin | 5070 -> 0 bytes | |||
| -rwxr-xr-x | build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so | bin | 5090 -> 0 bytes | |||
| -rwxr-xr-x | build_tools/bin/repo-cleanup.sh | 2 |
5 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/bin/check_repo.sh b/build_tools/bin/check_repo.sh index 9c95d02..5a3c984 100755 --- a/build_tools/bin/check_repo.sh +++ b/build_tools/bin/check_repo.sh @@ -1,6 +1,6 @@ #!/bin/bash cd /build_tools/bin #extra-testing will do both core and extra -testing -#check_repo/check_packages.py --abs-tree=/data/LinHES-PKGBUILD/abs --repos=extra --repo-dir=/data/pkg_repo/i686 +#check_repo/check_packages.py --abs-tree=/data/linhes_pkgbuild/abs --repos=core --repo-dir=/data/pkg_repo/i686 check_repo/check_packages.py --abs-tree=/data/linhes_pkgbuild/abs --repos=extra --repo-dir=/data/pkg_repo/i686 cd - diff --git a/build_tools/bin/check_repo/alpm.so b/build_tools/bin/check_repo/alpm.so Binary files differindex de28cf6..c9f402c 100755 --- a/build_tools/bin/check_repo/alpm.so +++ b/build_tools/bin/check_repo/alpm.so diff --git a/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so b/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so Binary files differdeleted file mode 100755 index de28cf6..0000000 --- a/build_tools/bin/check_repo/build/lib.linux-i686-2.6/alpm.so +++ /dev/null diff --git a/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so b/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so Binary files differdeleted file mode 100755 index ca29df3..0000000 --- a/build_tools/bin/check_repo/build/lib.linux-i686-2.7/alpm.so +++ /dev/null diff --git a/build_tools/bin/repo-cleanup.sh b/build_tools/bin/repo-cleanup.sh index 9c96933..ed6c140 100755 --- a/build_tools/bin/repo-cleanup.sh +++ b/build_tools/bin/repo-cleanup.sh @@ -23,7 +23,7 @@ do if [ $? = 1 ] then echo "removing file $LINE" - mv $REPO/$LINE-i686.pkg.tar.xz /tmp/$currentrepo_dups/ +# mv $REPO/$LINE-i686.pkg.tar.xz /tmp/$currentrepo_dups/ fi done < /tmp/pkglist-$currentrepo |