openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autodist: minor updates synced from running server installation

Browse Source
This commit is contained in:
Silvan Calarco 2019-07-15 17:39:27 +02:00
parent 058a0baa7e
commit c7d8a76d80
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autodist-upstream-updates
View File

@ -175,7 +175,7 @@ parse_arch_linux() {
#for page in `seq 1 45`; do #for page in `seq 1 45`; do
for rep in core community extra; do for rep in core community extra; do
# SOURCEURL="https://www.archlinux.org/packages/?page=$page&sort=-last_update&q=&arch=i686&maintainer=&flagged=" # SOURCEURL="https://www.archlinux.org/packages/?page=$page&sort=-last_update&q=&arch=i686&maintainer=&flagged="
SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/i686/" SOURCEURL="http://lug.mtu.edu/archlinux/$rep/os/x86_64/"
curl -L -s "$SOURCEURL" | \ curl -L -s "$SOURCEURL" | \
grep ".pkg." | grep -v ".sig\"" | \ grep ".pkg." | grep -v ".sig\"" | \
while read line; do while read line; do
@ -259,7 +259,7 @@ parse_gnome() {
parse_distromatic() { parse_distromatic() {
# parse distrowatch.com packages list # parse distrowatch.com packages list
[ "$quiet" ] || echo "Parsing Distrowatch packages list..." >&2 [ "$quiet" ] || echo "Parsing Distrowatch packages list..." >&2
SOURCEURL="http://distrowatch.gds.tuwien.ac.at/packages.php" SOURCEURL="https://distrowatch.com/packages.php"
lynx -width 300 -dump $SOURCEURL | lynx -width 300 -dump $SOURCEURL |
while read line; do while read line; do
[ "`echo $line | grep "Package Version Note"`" ] && start_print=1 [ "`echo $line | grep "Package Version Note"`" ] && start_print=1

13
automaint
View File

@ -173,13 +173,18 @@ rm -f $tmpfile
for p in ${allpkgs}; do for p in ${allpkgs}; do
pkgcontinue= pkgcontinue=
needsport= needsport=
for w in ${warningslist[*]}; do for w in ${warningslist[*]}; do
[ "$p" = "$w" ] && { pkgcontinue=1; break; } [ "$p" = "$w" ] && { pkgcontinue=1; break; }
done done
[ "$pkgcontinue" ] && continue [ "$pkgcontinue" ] && continue
for a in `seq 1 ${#ARCHS[*]}`; do for a in `seq 1 ${#ARCHS[*]}`; do
get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$PORT_REPOSITORY ${ARCHS[$a-1]} $p
if [ ! "$pkg_name" ]; then
get_pkg_buildinfo $LOCAL_REPS_BASE_DIR/distromatic/$DEST_REPOSITORY ${ARCHS[$a-1]} $p
fi
if [ "$pkg_name" ]; then if [ "$pkg_name" ]; then
spkg_version=$pkg_version spkg_version=$pkg_version
spkg_release=$pkg_release spkg_release=$pkg_release
@ -253,7 +258,7 @@ for p in ${allpkgs}; do
continue continue
fi fi
fi fi
if [ "$needsport" ]; then if [ "$needsport" -o "$pkg_repository" == "$PORT_REPOSITORY" ]; then
echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release)" echo "$p: importing from $SOURCE_REPOSITORY to $PORT_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release)"
if [ ! "$TESTMODE" ]; then if [ ! "$TESTMODE" ]; then
autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null autodist-repository import $SOURCE_REPOSITORY $p -d $PORT_REPOSITORY -y >/dev/null
@ -262,7 +267,7 @@ for p in ${allpkgs}; do
MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$PORT_REPOSITORY</b> for porting\"`" >/dev/null MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$PORT_REPOSITORY</b> for porting\"`" >/dev/null
fi fi
fi fi
else elif [ "$pkg_repository" == "$DEST_REPOSITORY" ]; then
echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release; update type: $update_type)" echo "$p: importing from $SOURCE_REPOSITORY to $DEST_REPOSITORY ($pkg_version-$pkg_release -> $spkg_version-$spkg_release; update type: $update_type)"
if [ ! "$TESTMODE" ]; then if [ ! "$TESTMODE" ]; then
autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null autodist-repository import $SOURCE_REPOSITORY $p -d $DEST_REPOSITORY -y >/dev/null
@ -271,6 +276,8 @@ MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b
MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$DEST_REPOSITORY</b>\"`" >/dev/null MESSAGE=`cgi_encodevar \"imported <b>$p</b> from <b>$SOURCE_REPOSITORY</b> to <b>$DEST_REPOSITORY</b>\"`" >/dev/null
fi fi
fi fi
else
echo "$p: unexpected upstream package repository; ignoring."
fi fi
done done

1
etc/autodist/blacklist
View File

@ -12,7 +12,6 @@ makedist
makedist-openmamba makedist-openmamba
postplug postplug
grub-theme-openmamba grub-theme-openmamba
kdevelop
lxde lxde
distromatic distromatic
u-boot u-boot

2
etc/autodist/scripts/update-specfile
View File

@ -52,6 +52,8 @@ done
sed -i "s|^Vendor:.*|Vendor: openmamba|; sed -i "s|^Vendor:.*|Vendor: openmamba|;
s|^Distribution:.*|Distribution: openmamba|; s|^Distribution:.*|Distribution: openmamba|;
/BuildRequires:[[:space:]]*libffmpeg-devel/d; /BuildRequires:[[:space:]]*libffmpeg-devel/d;
/^BuildRequires:[[:space:]]*libkdegames-devel/d;
/^BuildRequires:[[:space:]]*libkdegames5-devel/d;
s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|; s|\(BuildRequires:[[:space:]]*\)libmysql-devel|\1libmysql5-devel|;
s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-devel|; s|\(BuildRequires:[[:space:]]*\)libdb42-devel|\1libdb47-devel|;
s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|; s|\(BuildRequires:[[:space:]]*\)firefox-devel|\1xulrunner-devel|;