Compare commits

..

No commits in common. "a68f3116c939dc11a978e558388f676770dda53b" and "gatesgarth" have entirely different histories.

11 changed files with 14 additions and 25 deletions

View File

@ -14,7 +14,6 @@ BBLAYERS ?= " \
${TOPDIR}/../layers/meta-openembedded/meta-networking \ ${TOPDIR}/../layers/meta-openembedded/meta-networking \
${TOPDIR}/../layers/meta-openembedded/meta-perl \ ${TOPDIR}/../layers/meta-openembedded/meta-perl \
${TOPDIR}/../layers/meta-openembedded/meta-python \ ${TOPDIR}/../layers/meta-openembedded/meta-python \
${TOPDIR}/../layers/meta-openembedded/meta-webserver \
${TOPDIR}/../layers/meta-raspberrypi \ ${TOPDIR}/../layers/meta-raspberrypi \
${TOPDIR}/../layers/meta-virtualization \ ${TOPDIR}/../layers/meta-virtualization \
${TOPDIR}/../layers/meta-security \ ${TOPDIR}/../layers/meta-security \

View File

@ -11,5 +11,5 @@ BBFILE_COLLECTIONS += "meta-blackfinn"
BBFILE_PATTERN_meta-blackfinn = "^${LAYERDIR}/" BBFILE_PATTERN_meta-blackfinn = "^${LAYERDIR}/"
BBFILE_PRIORITY_meta-blackfinn = "12" BBFILE_PRIORITY_meta-blackfinn = "12"
LAYERSERIES_COMPAT_meta-blackfinn = "hardknott gatesgarth dunfell zeus warrior thud sumo rocko" LAYERSERIES_COMPAT_meta-blackfinn = "gatesgarth dunfell zeus warrior thud sumo rocko"

View File

@ -24,8 +24,8 @@ RDEPENDS_${PN} += " \
python3 \ python3 \
python3-gunicorn \ python3-gunicorn \
python3-flask \ python3-flask \
python3-rpi.gpio \ rpi.gpio \
python3-w1thermsensor \ w1thermsensor \
" "
FILES_${PN} = " \ FILES_${PN} = " \

View File

@ -24,7 +24,7 @@ RDEPENDS_${PN} += "\
python3 \ python3 \
python3-gunicorn \ python3-gunicorn \
python3-flask \ python3-flask \
python3-rpi.gpio \ rpi.gpio \
" "
FILES_${PN} = " \ FILES_${PN} = " \

View File

@ -1,5 +1,5 @@
LICENSE = "GPLv2" LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
FILESEXTRAPATHS_prepend := "${THISDIR}/files:" FILESEXTRAPATHS_prepend := "${THISDIR}/files:"

View File

@ -75,7 +75,7 @@ function generate_hostname() {
elif [ $idx = 30 ] ; then elif [ $idx = 30 ] ; then
res=8 res=8
elif [ $idx = 31 ] ; then elif [ $idx = 31 ] ; then
res=9 res=8
fi fi
basex="$basex${res}" basex="$basex${res}"
done done
@ -90,7 +90,7 @@ function generate_hostname() {
if [ $old_hostname = raspberrypi4-64 ] if [ $old_hostname = raspberrypi4-64 ]
then then
new_hostname=rpi4-$basex new_hostname=rpi3-$basex
fi fi
echo $new_hostname > /etc/hostname echo $new_hostname > /etc/hostname

View File

@ -7,8 +7,8 @@ require console-image-base.inc
DEV_SDK_INSTALL += " \ DEV_SDK_INSTALL += " \
git \ git \
make \ make \
python3-pip \ python-pip \
python3-dev \ python-dev \
bash \ bash \
packagegroup-core-buildessential \ packagegroup-core-buildessential \
" "

View File

@ -29,7 +29,7 @@ DEV_SDK_INSTALL = " \
file \ file \
perl-modules \ perl-modules \
pkgconfig \ pkgconfig \
python3-modules \ python-modules \
" "
EXTRA_TOOLS_INSTALL = " \ EXTRA_TOOLS_INSTALL = " \
@ -42,6 +42,7 @@ EXTRA_TOOLS_INSTALL = " \
findutils \ findutils \
i2c-tools \ i2c-tools \
less \ less \
mc \
procps \ procps \
rsync \ rsync \
sysfsutils \ sysfsutils \
@ -56,6 +57,7 @@ EXTRA_TOOLS_INSTALL = " \
" "
MQTT = " \ MQTT = " \
python-paho-mqtt \
" "
PYTHON_LIBS = " \ PYTHON_LIBS = " \

View File

@ -1,14 +0,0 @@
SUMMARY = "homeserver host system"
HOMEPAGE = "https://blackfinn.de"
LICENSE = "MIT"
require docker-host-image.bb
require dev-image.inc
IMAGE_INSTALL_append = " \
nginx \
python3-docker-compose \
"
export IMAGE_BASENAME = "homeserver-image"

View File

@ -11,6 +11,8 @@ inherit pypi setuptools3
PYPI_PACKAGE = "w1thermsensor" PYPI_PACKAGE = "w1thermsensor"
# TARGET_CFLAGS += "-fcommon"
RDEPENDS_${PN} = " \ RDEPENDS_${PN} = " \
python3 \ python3 \
" "