wbrawner/distribution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #704 from fewtarius/dev

Browse source 
Build any new kernel options, don't include libgo2 in the 32bit package, it gets built as a dependency when needed.
This commit is contained in:
fewtarius 2022-11-03 08:04:26 -04:00 committed by GitHub
commit ac6935c0ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/kernel/linux/package.mk
View file

@ -175,7 +175,7 @@ pre_make_target() {
${PKG_BUILD}/scripts/config --set-str CONFIG_EXTRA_FIRMWARE_DIR "external-firmware"
fi
kernel_make oldconfig
yes "" | kernel_make oldconfig
if [ -f "${ROOT}/${DISTRO}/kernel_options" ]; then
while read OPTION; do

2
packages/virtual/arm32/package.mk
View file

@ -4,6 +4,6 @@
PKG_NAME="arm32"
PKG_LICENSE="Apache-2.0"
PKG_SITE="www.jelos.org"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf libgo2 retroarch pcsx_rearmed parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp flycast"
PKG_DEPENDS_TARGET="toolchain squashfs-tools:host dosfstools:host fakeroot:host kmod:host mtools:host populatefs:host libc gcc linux linux-drivers linux-firmware libusb unzip socat p7zip file ${OPENGLES} SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL2_net SDL2_ttf retroarch pcsx_rearmed parallel-n64_rice parallel-n64_gln64 parallel-n64_glide64 gpsp flycast"
PKG_SECTION="virtual"
PKG_LONGDESC="Root package used to build and create 32-bit userland"

2
projects/Rockchip/packages/linux/package.mk
View file

@ -131,7 +131,7 @@ pre_make_target() {
sed -i "s|CONFIG_EXTRA_FIRMWARE=.*|CONFIG_EXTRA_FIRMWARE=\"${FW_LIST}\"|" ${PKG_BUILD}/.config
fi
kernel_make oldconfig
yes "" | kernel_make oldconfig
# regdb (backward compatability with pre-4.15 kernels)
if grep -q ^CONFIG_CFG80211_INTERNAL_REGDB= ${PKG_BUILD}/.config ; then