From 2bb8c19bdff6b45dbb2ce09d7f45ca42d56bcd4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:10:01 -0300 Subject: adding nonprism repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 42842de..5bff50a 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3 From f8051126147e57292eeaa730f2c499aea1b1a16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:20:13 -0300 Subject: fixing PKGEXT variable --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 5bff50a..0eb851a 100644 --- a/config +++ b/config @@ -45,7 +45,7 @@ OURARCHES=(mips64el) ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]}) DBEXT=".db.tar.gz" FILESEXT=".files.tar.gz" -PKGEXT=".pkg.tar.?z" +PKGEXT=".pkg.tar.xz" SRCEXT=".src.tar.gz" MAKEPKGCONF="~/.makepkg.conf" -- cgit v1.2.3 From 48995748c99dee29ca473463ffbf8b443b6c287a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:28:04 -0300 Subject: fixing db-move for any package architecture --- db-move | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/db-move b/db-move index 010d941..73c4517 100755 --- a/db-move +++ b/db-move @@ -47,7 +47,9 @@ for pkgbase in ${args[@]:2}; do for pkgname in ${pkgnames[@]}; do for tarch in ${tarches[@]}; do - getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null + getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null \ + || \ + getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-any${PKGEXT} >/dev/null done done continue 2 -- cgit v1.2.3 From e95d49c335723a15031083287d889c56a531ef1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Tue, 20 Aug 2013 00:34:28 -0300 Subject: revert back db-move --- db-move | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/db-move b/db-move index 73c4517..010d941 100755 --- a/db-move +++ b/db-move @@ -47,9 +47,7 @@ for pkgbase in ${args[@]:2}; do for pkgname in ${pkgnames[@]}; do for tarch in ${tarches[@]}; do - getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null \ - || \ - getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-any${PKGEXT} >/dev/null + getpkgfile "${ftppath_from}/${tarch}/"${pkgname}-${pkgver}-${pkgarch}${PKGEXT} >/dev/null done done continue 2 -- cgit v1.2.3 From 2a4a1c4015a4cc48f1613b7fd360148378775445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rcio=20Alexandre=20Silva=20Delgado?= Date: Wed, 21 Aug 2013 17:48:40 -0300 Subject: rename unfree to nonfree --- db-check-nonfree | 2 +- yf/PKGBUILD | 2 +- yf/your-freedom.install | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/db-check-nonfree b/db-check-nonfree index ab6491d..ecad3b9 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -33,7 +33,7 @@ for repo in ${ARCHREPOS[@]}; do fi done if [ ${#cleanpkgs[@]} -ge 1 ]; then - msg2 "Unfree: ${cleanpkgs[@]}" + msg2 "Nonfree: ${cleanpkgs[@]}" arch_repo_remove "${repo}" "${pkgarch}" ${cleanpkgs[@]} fi done diff --git a/yf/PKGBUILD b/yf/PKGBUILD index cc6f07b..e737482 100644 --- a/yf/PKGBUILD +++ b/yf/PKGBUILD @@ -2,7 +2,7 @@ pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 -pkgdesc="This package conflicts with every unfree package known to date." +pkgdesc="This package conflicts with every nonfree package known to date." arch=('any') url="https://parabolagnulinux.org" license=('GPL') diff --git a/yf/your-freedom.install b/yf/your-freedom.install index 49ae045..731a575 100644 --- a/yf/your-freedom.install +++ b/yf/your-freedom.install @@ -3,18 +3,18 @@ pre_install() { cat < Date: Thu, 22 Aug 2013 12:54:10 -0300 Subject: remove coherence repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 0eb851a..2c1fa43 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'coherence' 'nonprism') +PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3 From 3e085d0d529a749386f826ecb2dd189df55b4833 Mon Sep 17 00:00:00 2001 From: Icarious Date: Mon, 26 Aug 2013 05:26:11 +0530 Subject: removed unnecessary code --- cron-jobs/sourceballs2 | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2 index 5e228fc..5644268 100755 --- a/cron-jobs/sourceballs2 +++ b/cron-jobs/sourceballs2 @@ -60,32 +60,3 @@ for repo in ${PKGREPOS[@]}; do popd >/dev/null done # end repos - -# Cleanup old source packages -cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort" -cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort" -old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort")) - -if [ ${#old_pkgs[@]} -ge 1 ]; then - msg "Removing old source packages..." - ${SOURCE_CLEANUP_DRYRUN} && warning 'dry run mode is active' - for old_pkg in ${old_pkgs[@]}; do - msg2 "${old_pkg}" - if ! ${SOURCE_CLEANUP_DRYRUN}; then - mv "$ARCH_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}" - touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}" - fi - done -fi - -old_pkgs=($(find ${SOURCE_CLEANUP_DESTDIR} -type f -name "*${SRCEXT}" -mtime +${SOURCE_CLEANUP_KEEP} -printf '%f\n')) -if [ ${#old_pkgs[@]} -ge 1 ]; then - msg "Removing old source packages from the cleanup directory..." - for old_pkg in ${old_pkgs[@]}; do - msg2 "${old_pkg}" - ${SOURCE_CLEANUP_DRYRUN} || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}" - done -fi - -script_unlock - -- cgit v1.2.3 From f185efe31d518b08b45e07288a4239eddaac11b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 26 Aug 2013 16:36:21 -0300 Subject: remove deprecated repos --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 2c1fa43..f390bea 100644 --- a/config +++ b/config @@ -10,7 +10,7 @@ OURREPOS=('libre' 'libre-testing') # User repos USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos -PROJREPOS=('pcr' 'social' 'gis' 'artistic' 'elementary' 'kernels' 'radio' 'security' 'sugar' 'gnu' 'cross' 'java' 'java-ugly' 'nonprism') +PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos RMTREPOS=('connos' 'connos-extra') PKGREPOS=(${ARCHREPOS[@]} ${OURREPOS[@]} ${USERREPOS[@]} ${PROJREPOS[@]}) -- cgit v1.2.3 From 97ed9a26bd00c8a4c03a331c076e9f2a9c7ac57f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 26 Aug 2013 16:47:10 -0300 Subject: remove fauno repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index f390bea..0882c86 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~fauno' '~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') +USERREPOS=('~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3 From c2513af7d1a4ab9180cbcfd34135cd04add73c0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Wed, 28 Aug 2013 18:18:53 -0300 Subject: remove mtjm repo --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config b/config index 0882c86..6c652a7 100644 --- a/config +++ b/config @@ -8,7 +8,7 @@ ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib') # Official Parabola repos OURREPOS=('libre' 'libre-testing') # User repos -USERREPOS=('~smv' '~xihh' '~mtjm' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') +USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde') # Community project repos PROJREPOS=('pcr' 'kernels' 'cross' 'java' 'java-ugly' 'nonprism') # Remote repos -- cgit v1.2.3