Verified Commit 942c1a54 authored by Michal Hrusecky's avatar Michal Hrusecky 🦎

configs: Redo config to generate both config and lists

And include more stuff by default.
parent 24a937e2
......@@ -50,6 +50,21 @@ popd
[ -z "$OPENWRT_BRANCH" ] || PKG_BRANCH="-$OPENWRT_BRANCH"
cat configs/common configs/$TARGET_BOARD | sed -e "s|@BOARD@|$TARGET_BOARD|" -e "s|@BRANCH@|$PKG_BRANCH|" > .config
[ -n "$BUILD_ALL" ] && echo "CONFIG_ALL=y" >> .config && echo "CONFIG_SDK=y" >> .config
# Include important userlists
echo "Install " `sed -n 's|^CONFIG_PACKAGE_\([^=]*\)=.*|"\1"|p' .config` > base.lua
if [ "$TARGET_BOARD" = omnia ]; then
for i in lists/*; do
while read PKG; do
if expr "$PKG" : CONFIG_;then
echo "$PKG" >> .config
elif [ -n "$PKG" ]; then
echo "CONFIG_PACKAGE_$PKG=y" >> .config
fi
done < "$i"
done
fi
[ -n "$USE_CCACHE" ] && echo "CONFIG_CCACHE=y" >> .config
if [ -f "$HOME"/mime.key ]; then
echo "CONFIG_SIGNED_PACKAGES=y" >> .config
......@@ -94,6 +109,24 @@ cat >> logs/junit.xml << EOF
EOF
[ \! -d ./logs ] || mv ./logs ./logs-nand
# Generate lists
PUB_BIN_DIR="`ls -1d bin/* | head -n1`"
mkdir -p $PUB_BIN_DIR/lists
mv base.lua $PUB_BIN_DIR/lists
if [ -f "$HOME"/mime.key ]; then
staging_dir/host/bin/usign -S -m $PUB_BIN_DIR/lists/base.lua -s "$HOME"/mime.key
fi
for i in lists/*; do
echo -n "Install" > $PUB_BIN_DIR/lists/$(basename $i).lua
grep -v CONFIG_ "$i" | grep . | while read pkg; do
echo -n " \"$pkg\"" >> $PUB_BIN_DIR/lists/$(basename $i).lua
done
echo >> $PUB_BIN_DIR/lists/$(basename $i).lua
if [ -f "$HOME"/mime.key ]; then
staging_dir/host/bin/usign -S -m $PUB_BIN_DIR/lists/$(basename $i).lua -s "$HOME"/mime.key
fi
done
if [ "$TARGET_BOARD" = turris ]; then
#Build initramfs
echo -e "CONFIG_TARGET_ROOTFS_INITRAMFS=y\nCONFIG_TARGET_INITRAMFS_COMPRESSION_XZ=y" >> .config
......
......@@ -17,6 +17,10 @@ CONFIG_KERNEL_GPIO_PCA953X_IRQ=y
CONFIG_LIBC_USE_MUSL=y
CONFIG_USE_MUSL=y
CONFIG_MUSL_VERSION="1.1.11"
CONFIG_OPENSSL_WITH_EC=y
CONFIG_OPENSSL_WITH_EC2M=y
CONFIG_OPENSSL_ENGINE_CRYPTO=y
CONFIG_OPENSSL_ENGINE_DIGEST=y
# Other needed packages
CONFIG_PACKAGE_cert-backup=y
......@@ -25,29 +29,40 @@ CONFIG_PACKAGE_wireless-tools=y
CONFIG_PACKAGE_openssh-server=y
CONFIG_PACKAGE_kmod-wdt-orion=y
CONFIG_PACKAGE_schnapps=y
CONFIG_PACKAGE_kmod-crypto-marvell-cesa=m
CONFIG_PACKAGE_kmod-cryptodev=m
CONFIG_PACKAGE_kmod-crypto-cbc=m
CONFIG_PACKAGE_kmod-crypto-iv=m
CONFIG_PACKAGE_kmod-crypto-seqiv=m
CONFIG_PACKAGE_kmod-crypto-xts=m
CONFIG_PACKAGE_kmod-crypto-user=m
CONFIG_PACKAGE_kmod-dm=m
CONFIG_PACKAGE_sfpswitch=y
CONFIG_PACKAGE_kmod-tun=y
CONFIG_PACKAGE_bash=y
CONFIG_PACKAGE_psmisc=y
CONFIG_PACKAGE_shadow=y
CONFIG_PACKAGE_shadow-chage=y
CONFIG_PACKAGE_shadow-common=y
CONFIG_PACKAGE_shadow-groupadd=y
CONFIG_PACKAGE_shadow-groupdel=y
CONFIG_PACKAGE_shadow-groupmod=y
CONFIG_PACKAGE_shadow-groups=y
CONFIG_PACKAGE_shadow-passwd=y
CONFIG_PACKAGE_shadow-su=y
CONFIG_PACKAGE_shadow-useradd=y
CONFIG_PACKAGE_shadow-userdel=y
CONFIG_PACKAGE_shadow-usermod=y
CONFIG_PACKAGE_shadow-utils=y
CONFIG_PACKAGE_updater-migrate=y
CONFIG_shadow-all=y
# LuCI
CONFIG_PACKAGE_luci-app-ahcp=y
CONFIG_PACKAGE_luci-app-commands=y
CONFIG_PACKAGE_luci-app-ddns=y
CONFIG_PACKAGE_luci-app-minidlna=y
CONFIG_PACKAGE_luci-app-mjpg-streamer=y
CONFIG_PACKAGE_luci-app-ntpc=y
CONFIG_PACKAGE_luci-app-tinyproxy=y
CONFIG_PACKAGE_luci-app-transmission=y
CONFIG_PACKAGE_luci-app-upnp=y
CONFIG_PACKAGE_luci-app-watchcat=y
CONFIG_PACKAGE_luci-app-wshaper=y
CONFIG_PACKAGE_luci-proto-3g=y
CONFIG_PACKAGE_luci-proto-openconnect=y
CONFIG_PACKAGE_luci-proto-relay=y
CONFIG_PACKAGE_luci-proto-vpnc=y
# LXC stuff out of the box
CONFIG_PACKAGE_kmod-veth=y
CONFIG_PACKAGE_lxc=y
CONFIG_LXC_KERNEL_OPTIONS=y
CONFIG_PACKAGE_lxc-attach=y
CONFIG_PACKAGE_lxc-console=y
CONFIG_PACKAGE_lxc-start=y
CONFIG_PACKAGE_lxc-stop=y
CONFIG_PACKAGE_lxc-ls=y
CONFIG_PACKAGE_lxc-info=y
CONFIG_PACKAGE_lxc-autostart=y
CONFIG_PACKAGE_lxc-monitor=y
CONFIG_PACKAGE_lxc-monitord=y
CONFIG_PACKAGE_lxc-snapshot=y
CONFIG_PACKAGE_lxc-configs=y
CONFIG_PACKAGE_lxc-config=y
kmod-veth
lxc
lxc-attach
lxc-autostart
lxc-config
lxc-configs
lxc-console
lxc-create
lxc-hooks
lxc-info
lxc-ls
lxc-monitor
lxc-monitord
lxc-snapshot
lxc-start
lxc-stop
lxc-templates
rpcd-mod-lxc
luci-app-lxc
CONFIG_LXC_KERNEL_OPTIONS=y
acl
attr
badblocks
blkid
btrfs-progs
cfdisk
cryptsetup-openssl
davfs2
e2fsprogs
fdisk
file
fuse-utils
hd-idle
hdparm
hfsfsck
kmod-crypto-aead
kmod-crypto-authenc
kmod-crypto-cbc
kmod-crypto-ccm
kmod-crypto-cmac
kmod-crypto-crc32c
kmod-crypto-ctr
kmod-crypto-deflate
kmod-crypto-des
kmod-cryptodev
kmod-crypto-ecb
kmod-crypto-fcrypt
kmod-crypto-hash
kmod-crypto-hmac
kmod-crypto-iv
kmod-crypto-manager
kmod-crypto-marvell-cesa
kmod-crypto-md4
kmod-crypto-md5
kmod-crypto-null
kmod-crypto-pcbc
kmod-crypto-pcompress
kmod-crypto-rng-jitterentropy
kmod-crypto-seqiv
kmod-crypto-sha1
kmod-crypto-sha256
kmod-crypto-sha512
kmod-crypto-user
kmod-crypto-xts
kmod-dm
kmod-fs-afs
kmod-fs-autofs4
kmod-fs-btrfs
kmod-fs-cifs
kmod-fs-exfat
kmod-fs-exportfs
kmod-fs-ext4
kmod-fs-fscache
kmod-fs-f2fs
kmod-fs-hfs
kmod-fs-hfsplus
kmod-fs-isofs
kmod-fs-jfs
kmod-fs-msdos
kmod-fs-nfs
kmod-fs-nfs-common
kmod-fs-nfsd
kmod-fs-reiserfs
kmod-fs-udf
kmod-fs-vfat
kmod-fs-xfs
kmod-fuse
kmod-lib-crc-itu-t
kmod-lib-crc16
kmod-lib-crc32c
kmod-lib-lzo
kmod-lib-raid6
kmod-lib-xor
kmod-lib-zlib
kmod-mmc
kmod-nls-utf8
kmod-usb-storage-extras
kmod-usb2
losetup
lsblk
luci-app-hd-idle
luci-app-samba
luci-i18n-hd-idle-cs
luci-i18n-hd-idle-en
luci-i18n-samba-cs
luci-i18n-samba-en
lvm2
mdadm
mkhfs
mountd
mount-utils
nfs-kernel-server
nfs-kernel-server-utils
nfs-utils
ntfsprogs_ntfs-3g
ntfs-3g
ntfs-3g-utils
openssh-client
openssh-client-utils
openssh-sftp-client
openssh-sftp-server
partx-utils
resize2fs
rsync
rsyncd
samba36-client
samba36-server
sfdisk
smartd
smartmontools
sshfs
swap-utils
tar
transmission-daemon
tune2fs
wget
xfs-fsck
xfs-growfs
xfs-mkfs
CONFIG_PACKAGE_NTFS-3G_USE_LIBFUSE=y
CONFIG_PACKAGE_SAMBA_MAX_DEBUG_LEVEL=-1
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