From c56256903b3fb109e548ff048b90c89b5f55f2a4 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Mon, 20 Feb 2012 13:45:58 -0800
Subject: pacman.conf.chroot: change knoppmyth.net to linhes.org
---
templates/pacman.conf.chroot | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/templates/pacman.conf.chroot b/templates/pacman.conf.chroot
index 58857f9..0ab10ba 100644
--- a/templates/pacman.conf.chroot
+++ b/templates/pacman.conf.chroot
@@ -69,16 +69,16 @@ NoUpgrade = etc/func/minion.conf
# after the header, and they will be used before the default mirrors.
#[core]
-#Server = http://knoppmyth.net/repo/REPLACEME/$repo
+#Server = http://linhes.org/repo/REPLACEME/$repo
#[extra]
-#Server = http://knoppmyth.net/repo/REPLACEME/$repo
+#Server = http://linhes.org/repo/REPLACEME/$repo
#[chroot-devel]
-#Server = http://knoppmyth.net/repo/REPLACEME/$repo
+#Server = http://linhes.org/repo/REPLACEME/$repo
[core-testing]
-Server = http://knoppmyth.net/repo/REPLACEME/$repo
+Server = http://linhes.org/repo/REPLACEME/$repo
[extra-testing]
-Server = http://knoppmyth.net/repo/REPLACEME/$repo
+Server = http://linhes.org/repo/REPLACEME/$repo
--
cgit v0.12
From fb79d7de99d16fc7cd4e823d46863641f325f57a Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Mon, 20 Feb 2012 18:56:01 -0600
Subject: addedpacks: remove hd3000firmware.
---
.../larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks | 1 -
.../larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks | 1 -
.../larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks | 1 -
build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks | 1 -
build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks | 1 -
5 files changed, 5 deletions(-)
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
index f03d321..e2cece2 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-disk-testing-i686/addedpacks
@@ -213,7 +213,6 @@ mplayer-wrapper
#atl1e
linux-firmware
-hd3000firmware
larch-live
mkinitcpio-busybox
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
index f03d321..e2cece2 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-stable-i686/addedpacks
@@ -213,7 +213,6 @@ mplayer-wrapper
#atl1e
linux-firmware
-hd3000firmware
larch-live
mkinitcpio-busybox
diff --git a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
index f03d321..e2cece2 100755
--- a/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-local-mirror-testing-i686/addedpacks
@@ -213,7 +213,6 @@ mplayer-wrapper
#atl1e
linux-firmware
-hd3000firmware
larch-live
mkinitcpio-busybox
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
index f03d321..e2cece2 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-stable-i686/addedpacks
@@ -213,7 +213,6 @@ mplayer-wrapper
#atl1e
linux-firmware
-hd3000firmware
larch-live
mkinitcpio-busybox
diff --git a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
index f03d321..e2cece2 100755
--- a/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
+++ b/build_tools/larch8/larch0/profiles/linhes-remote-testing-i686/addedpacks
@@ -213,7 +213,6 @@ mplayer-wrapper
#atl1e
linux-firmware
-hd3000firmware
larch-live
mkinitcpio-busybox
--
cgit v0.12
From ccafc53c03852163cd67a63ce45577209da3ab20 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Tue, 21 Feb 2012 13:47:57 -0800
Subject: mp.py: Fix greedy deletes and false negatives when using --rmold
option. PKGVER must only contain numbers [0-9] or periods [.] when PKGVER is
different from the pervious PKGVER.
---
build_tools/bin/mp.py | 52 ++++++++++++++++++++++++++++++++++++---------------
1 file changed, 37 insertions(+), 15 deletions(-)
diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py
index 0fc4cfb..20835f0 100755
--- a/build_tools/bin/mp.py
+++ b/build_tools/bin/mp.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-# Version 0.7
+# Version 0.7.1
import os
import sys
@@ -243,13 +243,15 @@ def update_repo():
print "Package file:",TOTALPKG
# Remove old package(s) from local copy
- pv = re.compile('[\d]+[\w.]+')
+ oldpkgcheck = re.compile( i + "-" + epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' )
dirlist = os.listdir(DOCROOT)
for n in dirlist:
if n.startswith(i):
- num = len(i) + 1
- print "Bytes to seek ahead:",num
- OLDPKG = glob.glob(i + "-" + pv.search(n,num).group() + "-[0-9]*.pkg.tar.?z")
+ if not oldpkgcheck.search(n):
+ print n,"does not match"
+ continue
+ else:
+ OLDPKG = glob.glob(oldpkgcheck.search(n).group() + "*.pkg.tar.?z")
print "OLDPKG =",OLDPKG
if OLDPKG:
for DELPKG in OLDPKG:
@@ -273,28 +275,48 @@ def update_repo():
def update_src_pkg():
print "---------------------------------SRC------------------------------"
- print "SRCPKG:",SRCPKG
- OLDSRCPKG = []
+
os.chdir(SRCPKGHOME + "/" + REPO)
+
+ print
+ print "INFO: Changed working dir to",SRCPKGHOME + "/" + REPO
+ print
+
+ if pkgbase:
+ SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
+ i = pkgbase
+ else:
+ SRCPKG = pkgname + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
+ i = pkgname
+ print "Source package will be:",SRCPKG
+
+ if not SRCPKGHOME + "/" + REPO + "/" + SRCPKG:
+ print "ERROR in function update_repo: Couldn't find the new package",SRCPKGHOME + "/" + REPO + "/" + SRCPKG
+ sys.exit(2)
+
+ print "SRCPKG:",SRCPKG
+ oldpkgcheck = re.compile( i + "-" + epoch + '(pkgver|[\d.]+)' + "-" + '(?!pkgrel)' )
dirlist = os.listdir(SRCPKGHOME + "/" + REPO)
- #pv = re.compile('[\d]+[.]*[\d]*[.]*[\d]*[.]*[\d]*[.]*[\d]*')
- pv = re.compile('[\d]+[\w.]+')
if pkgbase:
# Remove old src package(s) from local copy
if "--rmold" in cli_list:
for n in dirlist:
if n.startswith(pkgbase):
- num = len(pkgbase) + 1
- print "Bytes to seek ahead:",num
- OLDSRCPKG = glob.glob(pkgbase + "-" + pv.search(n,num).group() + "-*.src.tar.?z")
+ if not oldpkgcheck.search(n):
+ print n,"does not match"
+ continue
+ else:
+ OLDSRCPKG = glob.glob(oldpkgcheck.search(n).group() + "*.src.tar.gz")
else:
# Remove old src package(s) from local copy
if "--rmold" in cli_list:
for n in dirlist:
if n.startswith(pkgname):
- num = len(pkgname) + 1
- print "Bytes to seek ahead:",num
- OLDSRCPKG = glob.glob(pkgname + "-" + pv.search(n,num).group() + "-*.src.tar.?z")
+ if not oldpkgcheck.search(n):
+ print n,"does not match"
+ continue
+ else:
+ OLDSRCPKG = glob.glob(oldpkgcheck.search(n).group() + "*.src.tar.gz")
if OLDSRCPKG:
print "OLDSRCPKG =",OLDSRCPKG
for DELSRCPKG in OLDSRCPKG:
--
cgit v0.12
From 24171bd1a79d6a2176f6df7a32d37146fa9b9306 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Mon, 27 Feb 2012 15:39:13 -0800
Subject: mp.py: fix local variable 'OLDSRCPKG' referenced before assignment
---
build_tools/bin/mp.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py
index 20835f0..9476f18 100755
--- a/build_tools/bin/mp.py
+++ b/build_tools/bin/mp.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-# Version 0.7.1
+# Version 0.7.2
import os
import sys
@@ -276,6 +276,7 @@ def update_repo():
def update_src_pkg():
print "---------------------------------SRC------------------------------"
+ OLDSRCPKG=""
os.chdir(SRCPKGHOME + "/" + REPO)
print
--
cgit v0.12
From 93b7418f2782633d93661e6b67fe0766b328a7c7 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Mon, 5 Mar 2012 13:41:06 -0800
Subject: mp.py: Gracefully handle split pkgbuilds without a pkgbase (0.7.3)
---
build_tools/bin/mp.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/build_tools/bin/mp.py b/build_tools/bin/mp.py
index 9476f18..dfdec94 100755
--- a/build_tools/bin/mp.py
+++ b/build_tools/bin/mp.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python2
-# Version 0.7.2
+# Version 0.7.3
import os
import sys
@@ -175,9 +175,9 @@ def bump_pkg():
print "Bumped " + pkgname + " release to " + str(new_pkgrel)
if pkgbase:
- SRCPKG = pkgbase + "-" + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz"
+ SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz"
else:
- SRCPKG = pkgname + "-" + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz"
+ SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + str(new_pkgrel) + ".src.tar.gz"
print "Source package will be: ",SRCPKG
def find_repo():
@@ -287,8 +287,8 @@ def update_src_pkg():
SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
i = pkgbase
else:
- SRCPKG = pkgname + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
- i = pkgname
+ SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
+ i = pkglist[0]
print "Source package will be:",SRCPKG
if not SRCPKGHOME + "/" + REPO + "/" + SRCPKG:
@@ -420,16 +420,15 @@ def config_file():
elif item == "epoch":
if value:
epoch = "%s:" %value
- print "epoch" , epoch
+ print "epoch:" , epoch
elif item == "arch":
arch = value
print "arch:",arch
-
if pkgbase:
SRCPKG = pkgbase + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
else:
- SRCPKG = pkgname + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
+ SRCPKG = pkglist[0] + "-" + epoch + pkgver + "-" + pkgrel + ".src.tar.gz"
print "Source package will be:",SRCPKG
# Get needed makepkg.conf variables
--
cgit v0.12