CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osinfo-db: remove url automation for non recommended distros.

Browse source
This commit is contained in:
Luis Guzmán 2023-06-02 16:48:28 +00:00
parent 688df75a0c
commit df35f0d86a
2 changed files with 8 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

3
helpers/DATA/osinfo-db/recommended-distros
View file

@ -7,6 +7,3 @@ Parabola - parabola.nu - parabola
PureOS - pureos.net - pureos PureOS - pureos.net - pureos
Trisquel - trisquel.info - trisquel Trisquel - trisquel.info - trisquel
Ututo - ututo.org - ututo Ututo - ututo.org - ututo
# FIXME: Required on the array by virt-manager
Debian - debian.org - debian

59
helpers/make-osinfo-db
View file

@ -18,7 +18,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=3 VERSION=4
EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main' EXTERNAL='deb-src http://ftp.us.debian.org/debian bookworm main'
REPOKEY=04EE7237B7D453EC REPOKEY=04EE7237B7D453EC
@ -26,7 +26,6 @@ REPOKEY=04EE7237B7D453EC
. ./config . ./config
rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}')) rd_domain=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$3}'))
rd_lcname=($(cat $DATA/recommended-distros|grep -v \#|awk '{print$5}'))
# Apply latest patchs # Apply latest patchs
for patch in $(ls -v ${DATA}/*.patch) for patch in $(ls -v ${DATA}/*.patch)
@ -41,60 +40,18 @@ for i in "${rd_domain[@]}"
do do
mv data/os/$i $TMPDIR || true mv data/os/$i $TMPDIR || true
done done
for a in $(ls data/os/) # Remove iso url for non-recommended distros, along with manjaro using custom url.
do grep -rl "<url>.*.iso.*</url>" data/os/|xargs sed -i "/.iso/d"
# Remove patches for non-free references. grep -rl '<url>' data/os/manjaro.org/|xargs sed -i "/<url>/d"
for b in $(grep -rl b/data/.*/$a debian/patches/|rev|awk -F '/' '{print$1}'|rev) mv $TMPDIR/* data/os/
do # Remove tests that will fail from previos iso url removal.
echo "Check for $b ..." rm tests/test_isoinfo.py tests/test_schema.py
sed -i "/$b/d" debian/patches/series
rm -f debian/patches/$b
done
rm -f $(grep -rl "\"os\", \"$a\"" scripts/updates/)
done
rm -rf data/os
mv $TMPDIR data/os
# Remove tests for non-free distros.
TMPDIR2=$(mktemp -d os-XXXX)
TMPDIR3=$(mktemp -d os-XXXX)
for i in "${rd_lcname[@]}"
do
mv tests/isodata/$i $TMPDIR2 || true
mv tests/treeinfodata/$i $TMPDIR3 || true
# Remove references to non-free containers
for a in $(ls tests/isodata/)
do
for b in $(grep -rl "ci/containers/$a" debian/patches/|rev|awk -F '/' '{print$1}'|rev)
do
rm -f debian/patches/$b
sed -i "/$b/d" debian/patches/series || true
done
rm -f $(ls ci/containers/$a*)
done
done
rm -rf tests/isodata
rm -rf tests/treeinfodata
mv $TMPDIR2 tests/isodata
mv $TMPDIR3 tests/treeinfodata
# Remove install-scripts
TMPDIR4=$(mktemp -d os-XXXX)
for i in "${rd_domain[@]}"
do
mv data/install-script/$i $TMPDIR4 || true
done
rm -rf data/install-script
mv $TMPDIR4 data/install-script
# Avoid test error out.
[ $(ls -A tests/treeinfodata)] || rm tests/test_treeinfo.py tests/test_related.py
#Apply changes for new fully free distros availbale at libosinfo. #Apply changes for new fully free distros availbale at libosinfo.
# trisquel.info # trisquel.info
sed -i '/derives-from/d' data/os/trisquel.info/trisquel-9.xml.in sed -i '/derives-from/d' data/os/trisquel.info/trisquel-9.xml.in
sed -i '/release-date/a \ \ \ \ <codename>Etiona</codename>' data/os/trisquel.info/trisquel-9.xml.in sed -i '/release-date/a \ \ \ \ <codename>Etiona</codename>' data/os/trisquel.info/trisquel-9.xml.in
changelog "Remove non-free suggestions from osinfo-db." changelog "Remove links to non-free distros suggestion from osinfo-db."
compile compile