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

osinfo-db: patch db to prevent virt-manager breaking.

Browse source
This commit is contained in:
Ark74 2023-05-27 01:45:11 -06:00
parent acfde020a0
commit e321de044e
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,3 +7,6 @@ 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

22
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=2 VERSION=3
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
@ -43,13 +43,14 @@ do
done done
for a in $(ls data/os/) for a in $(ls data/os/)
do do
# Remove os references # Remove patches for non-free references.
for b in $(grep -rl $a debian/patches/|sed 's|debian/patches/||') for b in $(grep -rl b/data/.*/$a debian/patches/|rev|awk -F '/' '{print$1}'|rev)
do do
echo "Check for $b ..." echo "Check for $b ..."
sed -i "/$b/d" debian/patches/series sed -i "/$b/d" debian/patches/series
rm debian/patches/$b rm -f debian/patches/$b
done done
rm -f $(grep -rl "\"os\", \"$a\"" scripts/updates/)
done done
rm -rf data/os rm -rf data/os
mv $TMPDIR data/os mv $TMPDIR data/os
@ -64,8 +65,12 @@ do
# Remove references to non-free containers # Remove references to non-free containers
for a in $(ls tests/isodata/) for a in $(ls tests/isodata/)
do do
rm $(grep -rl $a ci/containers/) || true for b in $(grep -rl "ci/containers/$a" debian/patches/|rev|awk -F '/' '{print$1}'|rev)
rm $(grep -rl $a ci/buildenv/) || true do
rm -f debian/patches/$b
sed -i "/$b/d" debian/patches/series || true
done
rm -f $(ls ci/containers/$a*)
done done
done done
rm -rf tests/isodata rm -rf tests/isodata
@ -83,14 +88,13 @@ rm -rf data/install-script
mv $TMPDIR4 data/install-script mv $TMPDIR4 data/install-script
# Avoid test error out. # Avoid test error out.
rm tests/test_treeinfo.py \ [ $(ls -A tests/treeinfodata)] || rm tests/test_treeinfo.py tests/test_related.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 db osinfo." changelog "Remove non-free suggestions from osinfo-db."
compile compile