Developing lightweight computation at the DSG edge

Commit 0b3bbfa2 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Ensure CONFIG_SELINUX is not enforced



For an unknown reason, CONFIG_SELINUX is considered by the ImageBuilder to be
enabled at cook() time. This forces procd-selinux to be installed instead of
procd (a dependency of mini_snmpd). This is possibly caused by OpenWrt commit
d355b578b7cc95c5b07fcecb217dbac4c05bd49c. Therefore, adding the mini_snmpd
package, which would normally depend on procd only, now also adds
procd-selinux. thus creating a conflict.

Fixes #483
Signed-off-by: default avatarRoger Pueyo Centelles <roger.pueyo@guifi.net>
parent aaa4a11b
......@@ -161,7 +161,8 @@ cook() {
echo "-> Cooking firmware image"
join_packages ${!flavor}
echo "--> Selected extra packages:$PKG"
make -C $ib image $profile PACKAGES="$PKG" EXTRA_IMAGE_NAME="$fw_extra_name" BIN_DIR="$output_dir" $ib_files $force_no_update $files_remove
# Fix for #483
make -C $ib image $profile PACKAGES="$PKG" EXTRA_IMAGE_NAME="$fw_extra_name" BIN_DIR="$output_dir" $ib_files $force_no_update $files_remove CONFIG_SELINUX=0
ERROR=$?
if (($ERROR != 0)); then
echo -e "\n-> Firmware not cooked, something wrong happened on the ImageBuilder compilation process"
......
# Flavors
openwrt_vanilla="luci"
qmpcli="qmp-system -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmptiny="qmp-tiny-node -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmpsmall="qmp-small-node opkg qmp-ncd -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmpsmallath10kqca988x80211s="qmp-small-node opkg qmp-ncd ath10k-firmware-qca988x kmod-ath10k -ath10k-firmware-qca988x-ct -kmod-ath10k-ct -kmod-ath10k-ct-smallbuffers -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmpsmallath10kqca988880211s="qmp-small-node opkg qmp-ncd ath10k-firmware-qca9888 kmod-ath10k -ath10k-firmware-qca9888-ct -kmod-ath10k-ct -kmod-ath10k-ct-smallbuffers -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmpbig="qmp-big-node opkg qmp-ncd qmp-ncgui -wpad-basic -wpad-mini -wpad-basic-wolfssl -procd-selinux"
qmpcli="qmp-system -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall -wpad-basic -wpad-mini -wpad-basic-wolfssl"
qmptiny="qmp-tiny-node -opkg -kmod-usb-core -kmod-usb-ledtrig-usbport -kmod-usb2 -ppp -ppp-mod-pppoe -6relayd -odhcp6c -odhcpd -ip6tables -firewall -wpad-basic -wpad-mini -wpad-basic-wolfssl"
qmpsmall="qmp-small-node opkg qmp-ncd -wpad-basic -wpad-mini -wpad-basic-wolfssl"
qmpsmallath10kqca988x80211s="qmp-small-node opkg qmp-ncd ath10k-firmware-qca988x kmod-ath10k -ath10k-firmware-qca988x-ct -kmod-ath10k-ct -kmod-ath10k-ct-smallbuffers -wpad-basic -wpad-mini -wpad-basic-wolfssl"
qmpsmallath10kqca988880211s="qmp-small-node opkg qmp-ncd ath10k-firmware-qca9888 kmod-ath10k -ath10k-firmware-qca9888-ct -kmod-ath10k-ct -kmod-ath10k-ct-smallbuffers -wpad-basic -wpad-mini -wpad-basic-wolfssl"
qmpbig="qmp-big-node opkg qmp-ncd qmp-ncgui -wpad-basic -wpad-mini -wpad-basic-wolfssl"
......@@ -2,6 +2,7 @@
# CONFIG_ALL_KMODS is not set
# CONFIG_ALL is not set
CONFIG_SIGNED_PACKAGES=y
# CONFIG_SELINUX is not set
CONFIG_PACKAGE_dnsmasq-dhcpv6=y
CONFIG_PACKAGE_qmp-big-node=m
CONFIG_PACKAGE_qmp-small-node=m
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment