mirror of
https://git.rockylinux.org/rocky/pungi-rocky.git
synced 2024-10-15 19:55:08 +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
|
||||
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; }
|
||||
echo "Moving i386 to i686"
|
||||
mv i386 i686
|
||||
if [ -d "i386" ]; then
|
||||
echo "Moving i386 to i686"
|
||||
mv i386 i686
|
||||
fi
|
||||
popd || { echo "Could not switch."; exit 1; }
|
||||
fi
|
||||
|
@ -20,10 +20,13 @@ else
|
||||
fi
|
||||
|
||||
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; }
|
||||
echo "Moving i386 to i686"
|
||||
mv i386 i686
|
||||
if [ -d "i386" ]; then
|
||||
echo "Moving i386 to i686"
|
||||
mv i386 i686
|
||||
fi
|
||||
popd || { echo "Could not switch."; exit 1; }
|
||||
fi
|
||||
|
@ -54,12 +54,8 @@ filter_modules = [
|
||||
"eclipse:rhel8",
|
||||
]
|
||||
}),
|
||||
("^devel$", {
|
||||
"i686":
|
||||
[
|
||||
"virt:rhel",
|
||||
]
|
||||
}),
|
||||
# newer pungi is overly strict on module data
|
||||
("^devel$", { "i686": ["*"] }),
|
||||
]
|
||||
|
||||
additional_packages = [
|
||||
|
Loading…
Reference in New Issue
Block a user