Skip to content

Commit

Permalink
Removed Arch support
Browse files Browse the repository at this point in the history
  • Loading branch information
dimkr committed Jun 12, 2016
1 parent fd9fb19 commit a9ccd29
Show file tree
Hide file tree
Showing 11 changed files with 0 additions and 259 deletions.
79 changes: 0 additions & 79 deletions woof-code/0setup
Original file line number Diff line number Diff line change
Expand Up @@ -179,82 +179,6 @@ do
RETSTAT=0
mv -f $xDLFILE ${PKGLISTFILE}pre
;;
arch)
#130126 arch code rewritten by noryb009: call find_cat afterward...
#130306 BK: sub() funtion to fix version relation operators...
#130306 BK: filtered out bad chars from description (note tortuous way to escape ' char)...
LANG=${LANGORG} echo "Processing ${DLFILE} please wait..."
xDLFILE="`basename $DLFILE .gz`" #actually it's a tarball: core.db.tar.gz, extra.db.tar.gz, community.db.tar.gz
rm -rf sandbox0 2>/dev/null
mkdir sandbox0
cd sandbox0
tar xzf "../$DLFILE"
RETSTAT=$?
cd ..
if [ $RETSTAT -eq 0 ];then
rm -f "$DLFILE"
xxDLFILE="`basename $DLFILE .db.tar.gz`" #this will be core, extra, community 130306
for i in sandbox0/*; do
cat "$i/desc" "$i/depends"
done | awk -v pkgpath="$xxDLFILE" '
function output() {
if(filename == "") return;
printf("%s-%s|%s|%s|%s||%sK|%s/os/i686|%s|%s|%s|\n", pkgname, pkgverarr[1], pkgname, pkgverarr[1], pkgverarr[2], pkgsize, pkgpath, filename, pkgdeps, pkgdesc)
pkgname=""; pkgverarr[1]=""; pkgverarr[2]=""; pkgsize=""; filename=""; pkgdeps=""; inDeps=0; pkgdesc="";
}
BEGIN{
inDeps=0
}
{
if($1 == ""){
#do nothing
}else if($1 == "%FILENAME%"){
inDeps=0
output()
getline filename
}else if($1 == "%NAME%"){
inDeps=0
getline pkgname
}else if($1 == "%VERSION%"){
inDeps=0
getline pkgver; split(pkgver, pkgverarr, "-")
}else if($1 == "%DESC%"){
inDeps=0
getline pkgdesc
gsub(/</, " ", pkgdesc)
gsub(/>/, " ", pkgdesc)
gsub(/\|/, " ", pkgdesc)
gsub(/'\''/, " ", pkgdesc)
gsub(/\"/, " ", pkgdesc)
gsub(/\(/, " ", pkgdesc)
gsub(/\)/, " ", pkgdesc)
}else if($1 == "%ISIZE%"){
inDeps=0
getline pkgsize; pkgsize = pkgsize / 1024
}else if($1 == "%DEPENDS%"){
inDeps=1
}else if($1 ~ /^%/){
inDeps=0
}else if(inDeps == 1){ # dependency
if(pkgdeps != "") pkgdeps=pkgdeps","
pkgdeps=pkgdeps"+"
sub(/>=/, "\\&ge", $0)
sub(/<=/, "\\&le", $0)
sub(/>/, "\\&gt", $0)
sub(/</, "\\&lt", $0)
sub(/=/, "\\&eq", $0)
pkgdeps=pkgdeps$0
}
}
END{
output();
}
' > /tmp/${PKGLISTFILE}temp #130306
${FIND_CAT} /tmp/${PKGLISTFILE}temp > $PKGLISTFILE #130126 130306
fi
rm -rf sandbox0 2>/dev/null
;;
t2) #w017
RETSTAT=0
;;
Expand Down Expand Up @@ -587,9 +511,6 @@ _END1
#get the category...
${FIND_CAT} /tmp/${ONE_PKGLISTS_COMPAT}temp > $ONE_PKGLISTS_COMPAT #130126
;;
arch)
LANG=${LANGORG} echo "...it's already in the Puppy standard format."
;;
t2) #w017
LANG=${LANGORG} echo "...it's already in the Puppy standard format."
;;
Expand Down
24 changes: 0 additions & 24 deletions woof-code/1download
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ BINARIES='deb' #download to packages-deb.
[ "$DISTRO_BINARY_COMPAT" = "slackware64" ] && BINARIES="tgz_txz" #140716 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "debian" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "devuan" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "arch" ] && BINARIES="tar_xz" #download to packages-tar_xz-${DISTRO_COMPAT_VERSION}. 130306
[ "$DISTRO_BINARY_COMPAT" = "puppy" ] && BINARIES="pet" #w018 built entirely from pet pkgs.
[ "$DISTRO_BINARY_COMPAT" = "gentoo" ] && BINARIES="gentoo" #120515 download to packages-gentoo-gap6
[ "$DISTRO_BINARY_COMPAT" = "raspbian" ] && BINARIES="deb_raspbian" #download to packages-deb_raspbian-${DISTRO_COMPAT_VERSION}.
Expand Down Expand Up @@ -422,11 +421,6 @@ do

#check if already downloaded...
[ -f packages-${BINARIES}/$DB_fullfilename ] && continue
#arch is a bit awkward, as the pkg may or may not have '-i686' in the name...
if [ "$DISTRO_BINARY_COMPAT" = "arch" ];then
altDB_fullfilename="`echo -n "$DB_fullfilename" | sed -e 's%\-i686\.pkg%.pkg%'`"
[ -f packages-${BINARIES}/$altDB_fullfilename ] && continue
fi
#...probably don't need this anymore ###NOTE###
#use wget to see if pkg on a repository, if not try a secondary repo, then a third.
#if found, download to packages-${BINARIES} (packages-deb).
Expand All @@ -437,15 +431,6 @@ do
do
wget --spider --tries=1 --timeout=20 ${ONE_BIN_URL}/${ONEFILE} > /dev/null 2>&1
RETSPIDER=$?
if [ "$DISTRO_BINARY_COMPAT" = "arch" -a $RETSPIDER -ne 0 ];then #pkg naming inconsistency problem.
altONEFILE="`echo -n "$ONEFILE" | sed -e 's%\-i686\.pkg%.pkg%'`"
wget --spider --tries=1 --timeout=20 ${ONE_BIN_URL}/${altONEFILE} > /dev/null 2>&1
RETSPIDER=$?
if [ $RETSPIDER -eq 0 ];then
ONEFILE="$altONEFILE"
DB_fullfilename="$altDB_fullfilename"
fi
fi
#...probably don't need this anymore ###NOTE###
[ $RETSPIDER -ne 0 ] && continue
cd packages-${BINARIES}
Expand All @@ -459,15 +444,6 @@ do
dpkg-deb --extract $DB_fullfilename tempdironly
[ $? -eq 0 ] && SUCCESS='yes'
;;
arch)
xz --test $DB_fullfilename > /dev/null 2>&1
if [ $? -eq 0 ];then
SUCCESS='yes'
else
gzip --test $DB_fullfilename > /dev/null 2>&1
[ $? -eq 0 ] && SUCCESS='yes'
fi
;;
slackware*) #100617 support .txz... #140716 support 64 bit
xz --test $DB_fullfilename > /dev/null 2>&1
if [ $? -eq 0 ];then
Expand Down
25 changes: 0 additions & 25 deletions woof-code/2createpackages
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ BINARIES='deb' #get them from packages-deb.
[ "$DISTRO_BINARY_COMPAT" = "slackware64" ] && BINARIES="tgz_txz" #140716 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "debian" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "devuan" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "arch" ] && BINARIES="tar_xz" #download to packages-tar_xz-${DISTRO_COMPAT_VERSION}. 130306
[ "$DISTRO_BINARY_COMPAT" = "puppy" ] && BINARIES="pet" #w018 built entirely from pet pkgs.
[ "$DISTRO_BINARY_COMPAT" = "gentoo" ] && BINARIES="gentoo" #120515 download to packages-gentoo-gap6
[ "$DISTRO_BINARY_COMPAT" = "raspbian" ] && BINARIES="deb_raspbian" #download to packages-deb_raspbian-${DISTRO_COMPAT_VERSION}.
Expand Down Expand Up @@ -532,30 +531,6 @@ then run this script again and choose to build ${GENERICNAME}." >> ERROR-2CREATE
rm -rf sandbox2/install
fi
;;
arch)
FULLPKGNAME="`basename $ONEBINARYPKG`"
PKGNAME="`basename $ONEBINARYPKG .pkg.tar.gz`" #ex: bash-3.2
PKGNAME="`basename $PKGNAME .pkg.tar.xz`" #ex: bash-3.2
PKGNAME="`echo -n "$PKGNAME" | sed 's%\-any$%%'`"
PKGNAME="`echo -n "$PKGNAME" | sed 's%\-i686$%%'`"
#PKGNAME="`echo -n "$PKGNAME" | sed 's%\-x86_64$%%'`" #for future
rm -rf sandbox2
mkdir sandbox2
cp -a $ONEBINARYPKG sandbox2/
cd sandbox2
if [ "`basename $ONEBINARYPKG .tar.xz`" != "`basename $ONEBINARYPKG`" ]; then
tar --force-local -Jxf $FULLPKGNAME #.tar.xz
else
tar --force-local -zxf $FULLPKGNAME #.tar.gz
fi
RETVAL=$?
rm -f $FULLPKGNAME
cd ..
if [ $RETVAL -ne 0 ];then
echo "ERROR: failed to unpack $PKGNAME"
continue
fi
;;
t2|gentoo) #120515
FULLPKGNAME="`basename $ONEBINARYPKG`"
PKGNAME="`basename $ONEBINARYPKG .tar.bz2`" #ex: bash-3.2
Expand Down
25 changes: 0 additions & 25 deletions woof-code/3builddistro-Z
Original file line number Diff line number Diff line change
Expand Up @@ -934,31 +934,6 @@ cd -
#KERNEL_DB_ENTRY="`cat rootfs-complete/pet.specs`"
#rm -f rootfs-complete/pet.specs

#arch .INSTALL files
#130316 NOTE: maybe could do this without chroot, as for slackware in 2createpackages (see 2createpackages-hack-install.sh).
# ok, I have looked through all pkgs used in build, most .INSTALL are trivial. these are slight exceptions:
# cmake glibc_dev_DEV libglade2 libwmf man_DEV openldap perl_DEV subversion_DEV
# but, don't really need to execute those either. besides, the code below is only operating upon rootfs-complete, it would be better
# to aufs mount the devx, as is done in sandbox2b in 2createpackages. comment out all of below...
if [ "${DISTRO_BINARY_COMPAT}" = "arch" ]; then
rm -f rootfs-complete/.INSTALL*
# numberOfDotInstall=1
# for FOLDER in `ls -1 ${WKGDIR}/packages-${DISTRO_FILE_PREFIX} | tr '\n' ' '` #130307
# do
# [ ! -f ${WKGDIR}/packages-${DISTRO_FILE_PREFIX}/${FOLDER}/.INSTALL ] && continue
# PKGVER="`grep -e '^pkgver' "${WKGDIR}/packages-${DISTRO_FILE_PREFIX}/${FOLDER}/.PKGINFO" | sed 's/^pkgver\ =\ //' | sed 's/-[^-]//'`"
# cp ${WKGDIR}/packages-${DISTRO_FILE_PREFIX}/${FOLDER}/.INSTALL "rootfs-complete/.INSTALL${numberOfDotInstall}-${PKGVER}"
# let numberOfDotInstall++
# done
# if [ "$WOOF_HOSTARCH" = "$WOOF_TARGETARCH" ];then #130316
# cp ${WKGDIR}/support/arch/runDotInstalls rootfs-complete/
# chroot "${PWD}/rootfs-complete" "/runDotInstalls" &> /dev/null
# rm -f rootfs-complete/runDotInstalls
# else
# echo "Unfortunately, cannot execute Arch install scripts, as this is a cross-build."
# fi
# rm -f rootfs-complete/.INSTALL*
fi
#130314 want to run arch post-install script from ppm also...
mkdir -p rootfs-complete/usr/local/petget
cp ${WKGDIR}/support/arch/runDotInstalls rootfs-complete/usr/local/petget/ArchRunDotInstalls
Expand Down
62 changes: 0 additions & 62 deletions woof-code/packages-templates/glibc/FIXUPHACK
Original file line number Diff line number Diff line change
Expand Up @@ -51,68 +51,6 @@ rm -f ./etc/profile.d/*.csh* 2>/dev/null
#[ -d usr/share/zoneinfo/right ] && rm -rf usr/share/zoneinfo/right
#[ -d usr/share/zoneinfo/SystemV ] && rm -rf usr/share/zoneinfo/SystemV

#130307 arch has moved libs from /lib to /usr/lib, which breaks chroot. move them back to proper place...
if [ "$DISTRO_BINARY_COMPAT" = "arch" ];then #exported from 2createpackages.
FNDCLIBS="$(find usr/lib -mindepth 1 -maxdepth 1 -name '*.so*')"
if [ "$FNDCLIBS" != "" ];then
for ONECLIB in $FNDCLIBS
do
[ "$ONECLIB" = "" ] && continue
BASECLIB="$(basename $ONECLIB)"
#it seems, traditionally, these stay in /usr/lib...
[ "$BASECLIB" = "libc.so" ] && [ ! -h $ONECLIB ] && continue
[ "$BASECLIB" = "libpthread.so" ] && [ ! -h $ONECLIB ] && continue
cp -a -f --remove-destination $ONECLIB ./lib/
rm -f $ONECLIB
done
#traditionally, there are some symlinks in /usr/lib, recreate...
FNDSYMLINKS="$(find lib -mindepth 1 -maxdepth 1 -name '*.so.[0-9]')"
if [ "$FNDSYMLINKS" != "" ];then
for ONESYMLINK in $FNDSYMLINKS
do
[ "$ONESYMLINK" = "" ] && continue
if [ -h $ONESYMLINK ];then
#TARGETLINK="$(readlink $ONESYMLINK)"
TARGETLINK="$(basename $ONESYMLINK)"
BASESYM="$(basename $ONESYMLINK | rev | cut -f 2-9 -d '.' | rev)"
[ -e usr/lib/$BASESYM ] && continue
ln -s ../../lib/$TARGETLINK usr/lib/$BASESYM
fi
done
fi
fi
#do the same for glibc_DEV...
mkdir -p ../glibc_DEV/lib
mkdir -p ../glibc_DEV/usr/lib
FNDCLIBS="$(find ../glibc_DEV/usr/lib -mindepth 1 -maxdepth 1 -name '*.so*')"
if [ "$FNDCLIBS" != "" ];then
for ONECLIB in $FNDCLIBS
do
[ "$ONECLIB" = "" ] && continue
BASECLIB="$(basename $ONECLIB)"
#it seems, traditionally, these stay in /usr/lib...
[ "$BASECLIB" = "libc.so" ] && [ ! -h $ONECLIB ] && continue
[ "$BASECLIB" = "libpthread.so" ] && [ ! -h $ONECLIB ] && continue
cp -a -f --remove-destination $ONECLIB ../glibc_DEV/lib/
rm -f $ONECLIB
done
#traditionally, there are some symlinks in /usr/lib, recreate...
FNDSYMLINKS="$(find ../glibc_DEV/lib -mindepth 1 -maxdepth 1 -name '*.so.[0-9]')"
if [ "$FNDSYMLINKS" != "" ];then
for ONESYMLINK in $FNDSYMLINKS
do
[ "$ONESYMLINK" = "" ] && continue
if [ -h $ONESYMLINK ];then
#TARGETLINK="$(readlink $ONESYMLINK)"
TARGETLINK="$(basename $ONESYMLINK)"
BASESYM="$(basename $ONESYMLINK | rev | cut -f 2-9 -d '.' | rev)"
[ -e ../glibc_DEV/usr/lib/$BASESYM ] && continue
ln -s ../../lib/$TARGETLINK ../glibc_DEV/usr/lib/$BASESYM
fi
done
fi
fi
fi
# remove 'incoming'
[ -d lib/incoming ] && rm -r lib/incoming

35 changes: 0 additions & 35 deletions woof-code/packages-templates/glibc_dev/FIXUPHACK
Original file line number Diff line number Diff line change
@@ -1,36 +1 @@

rm -rf ./usr/share/zoneinfo #100526

#130307 arch has moved libs from /lib to /usr/lib, which breaks chroot. move them back to proper place...
if [ "$DISTRO_BINARY_COMPAT" = "arch" ];then #exported from 2createpackages.
mkdir -p lib
mkdir -p usr/lib
FNDCLIBS="$(find usr/lib -mindepth 1 -maxdepth 1 -name '*.so*')"
if [ "$FNDCLIBS" != "" ];then
for ONECLIB in $FNDCLIBS
do
[ "$ONECLIB" = "" ] && continue
BASECLIB="$(basename $ONECLIB)"
#it seems, traditionally, these stay in /usr/lib...
[ "$BASECLIB" = "libc.so" ] && [ ! -h $ONECLIB ] && continue
[ "$BASECLIB" = "libpthread.so" ] && [ ! -h $ONECLIB ] && continue
cp -a -f --remove-destination $ONECLIB ./lib/
rm -f $ONECLIB
done
#traditionally, there are some symlinks in /usr/lib, recreate...
FNDSYMLINKS="$(find lib -mindepth 1 -maxdepth 1 -name '*.so.[0-9]')"
if [ "$FNDSYMLINKS" != "" ];then
for ONESYMLINK in $FNDSYMLINKS
do
[ "$ONESYMLINK" = "" ] && continue
if [ -h $ONESYMLINK ];then
#TARGETLINK="$(readlink $ONESYMLINK)"
TARGETLINK="$(basename $ONESYMLINK)"
BASESYM="$(basename $ONESYMLINK | rev | cut -f 2-9 -d '.' | rev)"
[ -e usr/lib/$BASESYM ] && continue
ln -s ../../lib/$TARGETLINK usr/lib/$BASESYM
fi
done
fi
fi
fi
3 changes: 0 additions & 3 deletions woof-code/rootfs-skeleton/usr/local/petget/fetchinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ case $DB_DISTRO in
ubuntu)
nohup defaulthtmlviewer http://packages.ubuntu.com/${DB_RELEASE}/${DB_nameonly} &
;;
arch)
nohup defaulthtmlviewer http://www.archlinux.org/packages/${DB_SUB}/i686/${DB_nameonly}/ &
;;
puppy|t2|gentoo)
#HOMELINK="`grep 'Homepage:' /tmp/gethomepage_2 | grep -o 'href=".*' | cut -f 2 -d '"'`"
#w019 fast (see also /usr/sbin/indexgen.sh)...
Expand Down
3 changes: 0 additions & 3 deletions woof-code/rootfs-skeleton/usr/local/petget/petget
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,6 @@ case $DISTRO_BINARY_COMPAT in
debian|devuan|ubuntu|raspbian)
COMPAT_EXT=".deb"
;;
arch)
COMPAT_EXT=".tar.gz"
;;
esac

#what type is it...
Expand Down
1 change: 0 additions & 1 deletion woof-code/support/2compat2pets
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ BINARIES='deb' #get them from packages-deb.
[ "$DISTRO_BINARY_COMPAT" = "slackware" ] && BINARIES="tgz_txz" #100617 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "slackware64" ] && BINARIES="tgz_txz" #100617 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "debian" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "arch" ] && BINARIES="tar_xz" #download to packages-tar_xz-${DISTRO_COMPAT_VERSION}. 130306
[ "$DISTRO_BINARY_COMPAT" = "puppy" ] && BINARIES="pet" #w018 built entirely from pet pkgs.
[ "$DISTRO_BINARY_COMPAT" = "raspbian" ] && BINARIES="deb_raspbian" #download to packages-deb_raspbian-${DISTRO_COMPAT_VERSION}.
BINARIES="${BINARIES}-${DISTRO_COMPAT_VERSION}" #w478
Expand Down
1 change: 0 additions & 1 deletion woof-code/support/3compat2pets
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ BINARIES='deb' #get them from packages-deb.
[ "$DISTRO_BINARY_COMPAT" = "slackware" ] && BINARIES="tgz_txz" #100617 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "slackware64" ] && BINARIES="tgz_txz" #100617 download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "debian" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "arch" ] && BINARIES="tar_xz" #download to packages-tar_gz-${DISTRO_COMPAT_VERSION}. 130306
[ "$DISTRO_BINARY_COMPAT" = "puppy" ] && BINARIES="pet" #w018 built entirely from pet pkgs.
[ "$DISTRO_BINARY_COMPAT" = "raspbian" ] && BINARIES="deb_raspbian" #download to packages-deb_raspbian-${DISTRO_COMPAT_VERSION}.
BINARIES="${BINARIES}-${DISTRO_COMPAT_VERSION}" #w478
Expand Down
1 change: 0 additions & 1 deletion woof-code/support/findpkgs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ BINARIES='deb' #get them from packages-deb.
[ "$DISTRO_BINARY_COMPAT" = "slackware" ] && BINARIES="tgz_txz" #download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "slackware64" ] && BINARIES="tgz_txz" #download to packages-tgz_txz-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "debian" ] && BINARIES="deb" #download to packages-deb-${DISTRO_COMPAT_VERSION}.
[ "$DISTRO_BINARY_COMPAT" = "arch" ] && BINARIES="tar_xz" #download to packages-tar_xz-${DISTRO_COMPAT_VERSION}. 130306
[ "$DISTRO_BINARY_COMPAT" = "puppy" ] && BINARIES="pet" #built entirely from pet pkgs.
[ "$DISTRO_BINARY_COMPAT" = "gentoo" ] && BINARIES="gentoo" #120515 download to packages-gentoo-gap6
[ "$DISTRO_BINARY_COMPAT" = "raspbian" ] && BINARIES="deb_raspbian" #download to packages-deb_raspbian-${DISTRO_COMPAT_VERSION}.
Expand Down

0 comments on commit a9ccd29

Please sign in to comment.