mirror of
https://git.rockylinux.org/rocky/pungi-rocky.git
synced 2024-11-24 13:51:26 +00:00
filter ALL modules for i686 devel
This commit is contained in:
parent
7a149eccbd
commit
f64c7d9ffa
@ -32,9 +32,11 @@ if [[ "$ret_val" != "0" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ "$ret_val" -eq 0 ]; then
|
||||||
pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
|
pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
|
||||||
echo "Moving i386 to i686"
|
if [ -d "i386" ]; then
|
||||||
mv i386 i686
|
echo "Moving i386 to i686"
|
||||||
|
mv i386 i686
|
||||||
|
fi
|
||||||
popd || { echo "Could not switch."; exit 1; }
|
popd || { echo "Could not switch."; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
@ -20,10 +20,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
time $CMD
|
time $CMD
|
||||||
|
ret_val=$?
|
||||||
|
|
||||||
if [ $? -eq 0 ]; then
|
if [ "$ret_val" -eq 0 ]; then
|
||||||
pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
|
pushd "${TARGET_DIR}/latest-Rocky-$SHORT-8/compose/$SHORT" || { echo "Could not switch."; exit 1; }
|
||||||
echo "Moving i386 to i686"
|
if [ -d "i386" ]; then
|
||||||
mv i386 i686
|
echo "Moving i386 to i686"
|
||||||
|
mv i386 i686
|
||||||
|
fi
|
||||||
popd || { echo "Could not switch."; exit 1; }
|
popd || { echo "Could not switch."; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
@ -54,12 +54,8 @@ filter_modules = [
|
|||||||
"eclipse:rhel8",
|
"eclipse:rhel8",
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
("^devel$", {
|
# newer pungi is overly strict on module data
|
||||||
"i686":
|
("^devel$", { "i686": ["*"] }),
|
||||||
[
|
|
||||||
"virt:rhel",
|
|
||||||
]
|
|
||||||
}),
|
|
||||||
]
|
]
|
||||||
|
|
||||||
additional_packages = [
|
additional_packages = [
|
||||||
|
Loading…
Reference in New Issue
Block a user