| 1 |
commit: 3389191e9e58e73be3f41bdb251fbb962b834890 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 6 13:07:56 2018 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 6 13:07:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3389191e |
| 7 |
|
| 8 |
build-sys: update after pym->lib move |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
Makefile.am | 2 +- |
| 13 |
configure.ac | 2 +- |
| 14 |
lib/Makefile.in | 2 +- |
| 15 |
tarball.sh | 20 +++++++++++++------- |
| 16 |
4 files changed, 16 insertions(+), 10 deletions(-) |
| 17 |
|
| 18 |
diff --git a/Makefile.am b/Makefile.am |
| 19 |
index aef9678db..9bcfa00e7 100644 |
| 20 |
--- a/Makefile.am |
| 21 |
+++ b/Makefile.am |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
SHELL = @PORTAGE_BASH@ |
| 24 |
|
| 25 |
-SUBDIRS = man bin pym cnf |
| 26 |
+SUBDIRS = man bin lib cnf |
| 27 |
|
| 28 |
AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip |
| 29 |
|
| 30 |
|
| 31 |
diff --git a/configure.ac b/configure.ac |
| 32 |
index 525109907..6b8021ec6 100644 |
| 33 |
--- a/configure.ac |
| 34 |
+++ b/configure.ac |
| 35 |
@@ -133,7 +133,7 @@ AC_CONFIG_FILES([ |
| 36 |
Makefile |
| 37 |
man/Makefile |
| 38 |
bin/Makefile |
| 39 |
- pym/Makefile |
| 40 |
+ lib/Makefile |
| 41 |
cnf/Makefile |
| 42 |
]) |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/lib/Makefile.in b/lib/Makefile.in |
| 46 |
index a32b219d6..7d4193cc9 100644 |
| 47 |
--- a/lib/Makefile.in |
| 48 |
+++ b/lib/Makefile.in |
| 49 |
@@ -12,7 +12,7 @@ top_builddir=@top_builddir@ |
| 50 |
portageuser = @portageuser@ |
| 51 |
portagegroup = @portagegroup@ |
| 52 |
|
| 53 |
-PORTAGE_PYM = @PORTAGE_BASE@/pym |
| 54 |
+PORTAGE_PYM = @PORTAGE_BASE@/lib |
| 55 |
INSTALL = @INSTALL@ |
| 56 |
INSTALL_subst = ${top_builddir}/subst-install |
| 57 |
|
| 58 |
|
| 59 |
diff --git a/tarball.sh b/tarball.sh |
| 60 |
index 9c3f64785..e67e7244c 100755 |
| 61 |
--- a/tarball.sh |
| 62 |
+++ b/tarball.sh |
| 63 |
@@ -13,6 +13,11 @@ export TMP="/var/tmp" |
| 64 |
export V="$1" |
| 65 |
export DEST="${TMP}/${PKG}-${V}" |
| 66 |
|
| 67 |
+if [[ -e ${DEST} ]]; then |
| 68 |
+ echo ${DEST} already exists, please remove first |
| 69 |
+ exit 1 |
| 70 |
+fi |
| 71 |
+ |
| 72 |
./tabcheck.py $( |
| 73 |
find ./ -name .git -o -name .hg -prune -o -type f ! -name '*.py' -print \ |
| 74 |
| xargs grep -l "#\!@PREFIX_PORTAGE_PYTHON@" \ |
| 75 |
@@ -22,14 +27,10 @@ export DEST="${TMP}/${PKG}-${V}" |
| 76 |
|
| 77 |
) |
| 78 |
|
| 79 |
-if [[ -e ${DEST} ]]; then |
| 80 |
- echo EXISTS ALREADY |
| 81 |
- exit 1 |
| 82 |
-fi |
| 83 |
- |
| 84 |
install -d -m0755 ${DEST} |
| 85 |
rsync -a --exclude='.git' --exclude='.hg' --exclude="repoman/" . ${DEST} |
| 86 |
-sed -i -e '/^VERSION\s*=/s/^.*$/VERSION = "'${V}-prefix'"/' ${DEST}/pym/portage/__init__.py |
| 87 |
+sed -i -e '/^VERSION\s*=/s/^.*$/VERSION = "'${V}-prefix'"/' \ |
| 88 |
+ ${DEST}/lib/portage/__init__.py |
| 89 |
sed -i -e "/version = /s/'[^']\+'/'${V}-prefix'/" ${DEST}/setup.py |
| 90 |
sed -i -e "1s/VERSION/${V}-prefix/" ${DEST}/man/{,ru/}*.[15] |
| 91 |
sed -i -e "s/@version@/${V}/" ${DEST}/configure.ac |
| 92 |
@@ -39,7 +40,12 @@ find -name '*~' | xargs --no-run-if-empty rm -f |
| 93 |
find -name '*.pyc' | xargs --no-run-if-empty rm -f |
| 94 |
find -name '*.pyo' | xargs --no-run-if-empty rm -f |
| 95 |
cd $TMP |
| 96 |
-rm -f ${PKG}-${V}/bin/emerge.py ${PKG}-${V}/bin/{pmake,sandbox} ${PKG}-${V}/{bin,pym}/'.#'* ${PKG}-${V}/{bin,pym}/*.{orig,diff} ${PKG}-${V}/{bin,pym}/*.py[oc] |
| 97 |
+rm -f \ |
| 98 |
+ ${PKG}-${V}/bin/emerge.py \ |
| 99 |
+ ${PKG}-${V}/bin/{pmake,sandbox} \ |
| 100 |
+ ${PKG}-${V}/{bin,lib}/'.#'* \ |
| 101 |
+ ${PKG}-${V}/{bin,lib}/*.{orig,diff} \ |
| 102 |
+ ${PKG}-${V}/{bin,lib}/*.py[oc] |
| 103 |
cd $TMP/${PKG}-${V} |
| 104 |
chmod a+x autogen.sh && ./autogen.sh || { echo "autogen failed!"; exit -1; }; |
| 105 |
rm -f autogen.sh tabcheck.py tarball.sh commit |
Archives