Drop x86 from dev.
This commit is contained in:
fewtarius
parent
1877b43453
commit
860d44743d
12 changed files with 29 additions and 112 deletions
1
Makefile
1
Makefile
|
|
@ -28,7 +28,6 @@ world: x86_64
|
|||
x86_64: handheld RK3588 RK3566
|
||||
|
||||
handheld:
|
||||
PROJECT=PC DEVICE=handheld ARCH=i686 ./scripts/build_distro
|
||||
PROJECT=PC DEVICE=handheld ARCH=x86_64 ./scripts/build_distro
|
||||
|
||||
RK3588:
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
# determines TARGET_CPU, if not forced by user
|
||||
if [ -z "${TARGET_CPU}" ]; then
|
||||
TARGET_CPU=i686
|
||||
fi
|
||||
|
||||
# 64bit userland
|
||||
if [ -z "${TARGET_FEATURES}" ]; then
|
||||
TARGET_FEATURES="32bit"
|
||||
else
|
||||
TARGET_FEATURES+=" 32bit"
|
||||
fi
|
||||
|
||||
# determine architecture's family
|
||||
TARGET_SUBARCH=i686
|
||||
|
||||
TARGET_GCC_ARCH="${TARGET_SUBARCH/-/}"
|
||||
TARGET_KERNEL_ARCH=x86
|
||||
|
||||
# setup ARCH specific *FLAGS
|
||||
TARGET_CFLAGS="-march=${TARGET_CPU}"
|
||||
TARGET_LDFLAGS="-march=${TARGET_CPU}"
|
||||
|
||||
# build with SIMD support ( yes / no )
|
||||
TARGET_FEATURES+=" mmx sse sse2"
|
||||
|
|
@ -494,9 +494,6 @@ setup_toolchain() {
|
|||
"x86_64")
|
||||
RUST_HOST="x86_64-unknown-linux-gnu"
|
||||
;;
|
||||
"i686")
|
||||
RUST_HOST="i686-unknown-linux-gnu"
|
||||
;;
|
||||
esac
|
||||
|
||||
export CARGO_TARGET_DIR="${PKG_BUILD}/.${RUST_HOST}/target"
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ KERNEL_NAME="${KERNEL_NAME:-KERNEL}"
|
|||
|
||||
LINUX_DEPENDS="${PROJECT_DIR}/${PROJECT}/linux ${PROJECT_DIR}/${PROJECT}/patches/linux ${PROJECT_DIR}/${PROJECT}/packages/linux ${ROOT}/packages/linux"
|
||||
[ -n "${DEVICE}" ] && LINUX_DEPENDS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/patches/linux ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/packages/linux"
|
||||
[[ "${TARGET_ARCH}" =~ i*86|x86_64 ]] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
|
||||
[ "${TARGET_ARCH}" = "x86_64" ] && LINUX_DEPENDS+=" ${ROOT}/packages/linux-firmware/intel-ucode ${ROOT}/packages/linux-firmware/kernel-firmware"
|
||||
|
||||
# Need to point to your actual cc
|
||||
# If you have ccache installed, take care that LOCAL_CC does not point to it
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ show_config() {
|
|||
|
||||
dashes="==========================="
|
||||
config_message="${config_message}\n ${dashes}${dashes}${dashes}"
|
||||
config_message="${config_message}\n Configuration for ${DISTRONAME}"
|
||||
config_message="${config_message}\n Configuration for ${DISTRO}NAME ($([ "$OFFICIAL" = "yes" ] && echo "official" || echo "community"))"
|
||||
config_message="${config_message}\n ${dashes}${dashes}${dashes}"
|
||||
|
||||
# Build options
|
||||
|
|
@ -131,7 +131,7 @@ show_config() {
|
|||
|
||||
config_message="${config_message}\n"
|
||||
config_message="${config_message}\n ${dashes}${dashes}${dashes}"
|
||||
config_message="${config_message}\n End Configuration for ${DISTRONAME}"
|
||||
config_message="${config_message}\n End Configuration for ${DISTRO}NAME"
|
||||
config_message="${config_message}\n ${dashes}${dashes}${dashes}"
|
||||
config_message="${config_message}\n\n\n"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
PKG_NAME="lib32"
|
||||
PKG_VERSION="$(date +%Y%m%d)"
|
||||
PKG_ARCH="aarch64 x86_64"
|
||||
PKG_ARCH="aarch64"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_DEPENDS_TARGET="toolchain retroarch SDL2 libsndfile libmodplug"
|
||||
PKG_SHORTDESC="ARM 32bit bundle for aarch64"
|
||||
|
|
@ -11,36 +11,25 @@ PKG_PRIORITY="optional"
|
|||
PKG_TOOLCHAIN="manual"
|
||||
|
||||
makeinstall_target() {
|
||||
|
||||
case ${TARGET_ARCH} in
|
||||
aarch64)
|
||||
LIBARCH="arm"
|
||||
LDSO="ld-linux-armhf.so.3"
|
||||
;;
|
||||
x86_64)
|
||||
LIBARCH="x86"
|
||||
LDSO="ld-linux.so.2"
|
||||
;;
|
||||
esac
|
||||
|
||||
cd ${PKG_BUILD}
|
||||
LIBROOT="${ROOT}/build.${DISTRO}-${DEVICE}.${LIBARCH}/image/system/"
|
||||
mkdir -p ${INSTALL}/usr/lib32
|
||||
rsync -al ${LIBROOT}/usr/lib/* ${INSTALL}/usr/lib32 >/dev/null 2>&1
|
||||
chmod -f 0755 ${INSTALL}/usr/lib32/* || :
|
||||
LIBROOT="${ROOT}/build.${DISTRO}-${DEVICE}.arm/image/system/"
|
||||
if [ "${ARCH}" = "aarch64" ]; then
|
||||
mkdir -p ${INSTALL}/usr/lib32
|
||||
rsync -al ${LIBROOT}/usr/lib/* ${INSTALL}/usr/lib32 >/dev/null 2>&1
|
||||
chmod -f +x ${INSTALL}/usr/lib32/* || :
|
||||
fi
|
||||
mkdir -p ${INSTALL}/usr/lib
|
||||
ln -s /usr/lib32/${LDSO} ${INSTALL}/usr/lib/${LDSO}
|
||||
ln -s /usr/lib32/ld-linux-armhf.so.3 ${INSTALL}/usr/lib/ld-linux-armhf.so.3
|
||||
|
||||
mkdir -p "${INSTALL}/etc/ld.so.conf.d"
|
||||
echo "/usr/lib32" > "${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32.conf"
|
||||
echo "/usr/lib32/pulseaudio" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-pulseaudio.conf"
|
||||
|
||||
echo "/usr/lib32" > "${INSTALL}/etc/ld.so.conf.d/arm-lib32.conf"
|
||||
echo "/usr/lib32/pulseaudio" >"${INSTALL}/etc/ld.so.conf.d/arm-lib32-pulseaudio.conf"
|
||||
if [ -d "${LIBROOT}/usr/lib/dri" ]
|
||||
then
|
||||
echo "/usr/lib32/dri" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-dri.conf"
|
||||
echo "/usr/lib32/dri" >"${INSTALL}/etc/ld.so.conf.d/arm-lib32-dri.conf"
|
||||
fi
|
||||
if [ -d "${LIBROOT}/usr/lib/gl4es" ]
|
||||
then
|
||||
echo "/usr/lib/gl4es" >"${INSTALL}/etc/ld.so.conf.d/${LIBARCH}-lib32-gl4es.conf"
|
||||
echo "/usr/lib/gl4es" >"${INSTALL}/etc/ld.so.conf.d/arm-lib32-gl4es.conf"
|
||||
fi
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,4 +4,4 @@
|
|||
export BOX86_PREFER_EMULATED=1
|
||||
export BOX86_LD_LIBRARY_PATH="/usr/share/box86/lib"
|
||||
export BOX86_BASH="/usr/bin/bash-x86"
|
||||
alias box86='LD_LIBRARY_PATH=/usr/lib32:/usr/lib32/gles /usr/bin/box86'
|
||||
alias box86='LD_LIBRARY_PATH=/usr/lib32:${LD_LIBRARY_PATH} box86'
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
# SPDX-License-Identifier: Apache-2.0
|
||||
# Copyright (C) 2022 - Fewtarius
|
||||
|
||||
PKG_NAME="x86"
|
||||
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 SDL2 SDL2_gfx SDL2_image SDL2_mixer SDL_sound SDL2_net SDL2_ttf retroarch flycast"
|
||||
PKG_SECTION="virtual"
|
||||
PKG_LONGDESC="Root package used to build and create 32-bit userland"
|
||||
|
||||
if [ ! "${OPENGL}" = "no" ]; then
|
||||
PKG_DEPENDS_TARGET+=" ${OPENGL} glu libglvnd glew"
|
||||
fi
|
||||
|
||||
if [ "${OPENGLES_SUPPORT}" = yes ]; then
|
||||
PKG_DEPENDS_TARGET+=" ${OPENGLES}"
|
||||
fi
|
||||
|
||||
if [ "${VULKAN_SUPPORT}" = "yes" ]
|
||||
then
|
||||
PKG_DEPENDS_TARGET+=" vulkan-loader vulkan-headers"
|
||||
fi
|
||||
|
||||
if [ "${DISPLAYSERVER}" = "wl" ]; then
|
||||
PKG_DEPENDS_TARGET+=" wayland ${WINDOWMANAGER}"
|
||||
fi
|
||||
|
|
@ -1 +0,0 @@
|
|||
linux.x86_64.conf
|
||||
|
|
@ -1,16 +1,3 @@
|
|||
case ${TARGET_ARCH} in
|
||||
x86_64)
|
||||
# (AMD CPUs) k8 k8-sse3 opteron opteron-sse3 athlon64 athlon64-sse3
|
||||
# athlon-fx amdfam10 barcelona
|
||||
# (Intel CPUs) atom core2 nocona
|
||||
#
|
||||
TARGET_CPU="x86-64"
|
||||
;;
|
||||
i686)
|
||||
TARGET_CPU="i686"
|
||||
;;
|
||||
esac
|
||||
|
||||
# kernel command line
|
||||
EXTRA_CMDLINE="quiet console=tty0 ssh consoleblank=0 systemd.show_status=0 loglevel=0 panic=20 intel_pstate=disable"
|
||||
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ for directory in etc dev proc run sys tmp usr var flash storage; do
|
|||
mkdir -p ${INSTALL}/${directory}
|
||||
done
|
||||
|
||||
MTADDONBUILD=no start_multithread_build ${1} || die "Parallel build failure - see log for details. Time of failure: $(date)"
|
||||
MTADDONBUILD=no start_multithread_build arm32 || die "Parallel build failure - see log for details. Time of failure: $(date)"
|
||||
echo "Successful build! Building compatibility root..." >&2
|
||||
exit 0
|
||||
|
||||
|
|
|
|||
|
|
@ -86,22 +86,18 @@ rm -f ./release/${DISTRO}-${DEVICE}.${ARCH}-*
|
|||
# Remove the image root as it should be regenerated for every build.
|
||||
rm -rf ./build.${DISTRO}-${DEVICE}.${ARCH}/image
|
||||
|
||||
case ${ARCH} in
|
||||
arm)
|
||||
[ "${BASE_ONLY}" == "true" ] && exit 0
|
||||
echo ARM
|
||||
scripts/build_compat arm32
|
||||
scripts/install arm32
|
||||
;;
|
||||
i686)
|
||||
[ "${BASE_ONLY}" == "true" ] && exit 0
|
||||
echo i686
|
||||
scripts/build_compat x86
|
||||
scripts/install x86
|
||||
;;
|
||||
*)
|
||||
make image
|
||||
esac
|
||||
if [ "${ARCH}" == "arm" ]
|
||||
then
|
||||
if [ "${BASE_ONLY}" == true ]
|
||||
then
|
||||
echo "Skipping 32bit."
|
||||
exit 0
|
||||
fi
|
||||
scripts/build_compat
|
||||
scripts/install arm32
|
||||
else
|
||||
make image
|
||||
fi
|
||||
|
||||
if [ ! $? == 0 ]
|
||||
then
|
||||
|
|
|
|||
Loading…
Reference in a new issue