From 88300710db2eec3b8d082d8cc907a1f8a56f4ad2 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Fri, 27 Feb 2015 11:59:28 +0100 Subject: [PATCH 1/6] systemd: Yocto master has moved to system_219.. follow --- yocto-dizzy/{systemd_216.bbappend => systemd_219.bbappend} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename yocto-dizzy/{systemd_216.bbappend => systemd_219.bbappend} (100%) diff --git a/yocto-dizzy/systemd_216.bbappend b/yocto-dizzy/systemd_219.bbappend similarity index 100% rename from yocto-dizzy/systemd_216.bbappend rename to yocto-dizzy/systemd_219.bbappend From 21356b75081fd048be946eac3fafc184f916e1a6 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Tue, 24 Feb 2015 20:59:11 +0100 Subject: [PATCH 2/6] initrdscripts: make it possbile to secure grub with a password * an example setup for the IDU can be found on https://projects.sysmocom.de/redmine/projects/sob-idu/wiki/ProvisioningSetup Fixes: SYS#1130 --- .../images/core-image-minimal-initramfs.bbappend | 14 +++++++++++++- recipes-core/initrdscripts/files/init-install.sh | 12 ++++++++++++ .../initramfs-live-install_sysmocom.inc | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/recipes-core/images/core-image-minimal-initramfs.bbappend b/recipes-core/images/core-image-minimal-initramfs.bbappend index 26fd5b0491..3d7c27c9f8 100644 --- a/recipes-core/images/core-image-minimal-initramfs.bbappend +++ b/recipes-core/images/core-image-minimal-initramfs.bbappend @@ -4,4 +4,16 @@ change_udev_automounter_ro() { sed -i -e 's/\-t auto/\-t auto \-o ro/' ${IMAGE_ROOTFS}/etc/udev/scripts/mount.sh } -ROOTFS_POSTPROCESS_COMMAND += "change_udev_automounter_ro ; " +bootuser = "${@d.getVar('BOOT_USER', True) or ""}" +bootpasswd = "${@d.getVar('BOOT_PASSWD', True) or ""}" + +set_boot_passwd() { + if [ -n "${bootpasswd}" ] && [ -n "${bootuser}" ]; then + sed -e "s/^\(BOOTPASSWD=\)/\1${bootpasswd}/g" \ + -e "s/^\(BOOTUSER=\)/\1${bootuser}/g" \ + -i ${IMAGE_ROOTFS}/install.sh + echo "Generated new grub-passwd" + fi +} + +ROOTFS_POSTPROCESS_COMMAND += "change_udev_automounter_ro ; set_boot_passwd; " diff --git a/recipes-core/initrdscripts/files/init-install.sh b/recipes-core/initrdscripts/files/init-install.sh index 6c22174d30..4ca4b838c7 100644 --- a/recipes-core/initrdscripts/files/init-install.sh +++ b/recipes-core/initrdscripts/files/init-install.sh @@ -175,10 +175,22 @@ terminal_input --append serial terminal_output --append serial EOF +BOOTPASSWD= +BOOTUSER= +if [ -n "${BOOTPASSWD}" ] && [ -n "${BOOTUSER}" ]; then +cat >> $GRUBCFG << EOF +set superusers="$BOOTUSER" +password $BOOTUSER $BOOTPASSWD +EOF +fi + if [ -f /etc/grub.d/40_custom ] ; then echo "Preparing custom grub2 menu..." cat /etc/grub.d/40_custom >> $GRUBCFG + if [ -n "${BOOTPASSWD}" ] && [ -n "${BOOTUSER}" ]; then + sed -i "s/\(menuentry\)\(.*\)\({\)/\1\2--unrestricted \3/g" $GRUBCFG + fi sed -i "s@__ROOTFS__@$rootfs $rootwait@g" $GRUBCFG sed -i "s/__VIDEO_MODE__/$kernel_cmdline_video_mode/g" $GRUBCFG sed -i "s/__VGA_MODE__/$kernel_cmdline_vga_mode/g" $GRUBCFG diff --git a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc index 107dfd3430..d507aa3fc4 100644 --- a/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc +++ b/recipes-core/initrdscripts/initramfs-live-install_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/files:" -PRINC = "1" +PRINC = "2" RDEPENDS_${PN} += "e2fsprogs-e2fsck" From ea1483dd5cb2f8cdb3bd9d92f2d4569dee60c16d Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 18 Mar 2015 14:12:59 +0100 Subject: [PATCH 3/6] wireless-tools: Remove our hack from the package This is not of general interest for our users. Move the code somewhere else. Related: SYS#922 --- .../files/0001-Add-wifi2udp-program.patch | 197 ------------------ .../wireless-tools/files/wifi2udp.service | 9 - .../wireless-tools_sysmocom.inc | 21 -- yocto-dizzy/wireless-tools_30.pre9.bbappend | 1 - 4 files changed, 228 deletions(-) delete mode 100644 recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch delete mode 100644 recipes-fixes/wireless-tools/files/wifi2udp.service delete mode 100644 recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc delete mode 100644 yocto-dizzy/wireless-tools_30.pre9.bbappend diff --git a/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch b/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch deleted file mode 100644 index 11af861c26..0000000000 --- a/recipes-fixes/wireless-tools/files/0001-Add-wifi2udp-program.patch +++ /dev/null @@ -1,197 +0,0 @@ -From 987960ea03c59a2ef9164e4f7309031ef4e0242d Mon Sep 17 00:00:00 2001 -Message-Id: <987960ea03c59a2ef9164e4f7309031ef4e0242d.1410189314.git.daniel@totalueberwachung.de> -From: Daniel Willmann -Date: Mon, 8 Sep 2014 15:53:54 +0200 -Subject: [PATCH 1/1] Add wifi2udp program - ---- - Makefile | 4 +- - wifi2udp.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 149 insertions(+), 1 deletion(-) - create mode 100644 wifi2udp.c - -Index: wireless_tools.30/Makefile -=================================================================== ---- wireless_tools.30.orig/Makefile -+++ wireless_tools.30/Makefile -@@ -50,7 +50,7 @@ WEXT_HEADER = wireless.$(WE_VERSION).h - # Targets to build - STATIC=libiw.a - DYNAMIC=libiw.so.$(WT_VERSION) --PROGS= iwconfig iwlist iwpriv iwspy iwgetid iwevent ifrename -+PROGS= iwconfig iwlist iwpriv iwspy iwgetid iwevent ifrename wifi2udp - MANPAGES8=iwconfig.8 iwlist.8 iwpriv.8 iwspy.8 iwgetid.8 iwevent.8 ifrename.8 - MANPAGES7=wireless.7 - MANPAGES5=iftab.5 -@@ -105,7 +105,7 @@ endif - - # Other flags - CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \ -- -Wpointer-arith -Wcast-qual -Winline -I. -+ -Wpointer-arith -Wcast-qual -Winline -I. -ggdb3 - #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I. - DEPFLAGS=-MMD - XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG) -@@ -137,6 +137,8 @@ ifrename: ifrename.o $(IWLIB) - - macaddr: macaddr.o $(IWLIB) - -+wifi2udp: wifi2udp.o $(IWLIB) -+ - iwmulticall: iwmulticall.o - $(CC) $(LDFLAGS) $(STRIPFLAGS) $(XCFLAGS) -o $@ $^ $(LIBS) - -Index: wireless_tools.30/wifi2udp.c -=================================================================== ---- /dev/null -+++ wireless_tools.30/wifi2udp.c -@@ -0,0 +1,149 @@ -+ -+#include -+#include -+#include -+#include -+ -+#include -+ -+static int verbose = 0; -+static int delay = 10; -+ -+static void escape_essid(const char *src, char *dst, ssize_t len) -+{ -+ int i, j; -+ -+ for (i = 0, j = 0; j < len; i++, j++) { -+ if (src[i] == '"') { -+ dst[j] = '\\'; -+ j++; -+ if (j == len) -+ break; -+ } -+ -+ dst[j] = src[i]; -+ -+ if (!src[i]) -+ return; -+ } -+} -+ -+static void scan_wifi(char *iface, const char *oduiface, const char *server, int port) -+{ -+ int sock, rc; -+ iwrange range; -+ struct ifreq buf; -+ char mac[20]; -+ -+ struct sockaddr_in remote; -+ struct hostent *hp; -+ -+ hp = gethostbyname(server); -+ if (!hp) { -+ printf("Could not resolve %s\n", server); -+ exit(-1); -+ } -+ -+ remote.sin_family = AF_INET; -+ memcpy(&remote.sin_addr, hp->h_addr, hp->h_length); -+ remote.sin_port = htons(port); -+ -+ /* Retrieve MAC address of Wifi card */ -+ sock = socket(PF_INET, SOCK_DGRAM, 0); -+ memset(&buf, 0, sizeof(buf)); -+ -+ strcpy(buf.ifr_name, oduiface); -+ ioctl(sock, SIOCGIFHWADDR, &buf); -+ iw_sawap_ntop(&buf.ifr_hwaddr, mac); -+ -+ sock = iw_sockets_open(); -+ -+ rc = iw_get_range_info(sock, iface, &range); -+ if (rc < 0) { -+ printf("iw_get_range_info() returned %i\n", rc); -+ exit(2); -+ } -+ -+ while (1) { -+ time_t now; -+ wireless_scan_head head; -+ wireless_scan *result; -+ /* Scan for wireless networks */ -+ rc = iw_scan(sock, iface, range.we_version_compiled, &head); -+ if (rc < 0) { -+ printf("iw_scan() returned %i\n", rc); -+ exit(2); -+ } -+ -+ now = time(NULL); -+ -+ /* Print the results */ -+ result = head.result; -+ while (NULL != result) { -+ char bssid[20]; -+ char line[1024]; -+ char essid_escaped[50]; -+ wireless_scan *old_result; -+ iw_sawap_ntop(&result->ap_addr, bssid); -+ -+ escape_essid(result->b.essid, essid_escaped, 50); -+ snprintf(line, 1024, "WIFI,%li,%s,\"%s\",%s,%0.0f,%i\r\n", now, mac, essid_escaped, bssid, result->b.freq/1000000, (int8_t)result->stats.qual.level); -+ if (verbose) -+ printf("%s", line); -+ rc = sendto(sock, line, strlen(line), 0, (struct sockaddr*)&remote, sizeof(remote)); -+ if (rc == -1) -+ printf("Failed to send message: %s\n", strerror(errno)); -+ old_result = result; -+ result = result->next; -+ free(old_result); -+ } -+ sleep(delay); -+ } -+} -+ -+static void usage(void) -+{ -+ printf("Usage: prog [options] host [port]\n"); -+} -+ -+int main(int argc, char *argv[]) -+{ -+ int option; -+ char *wifiiface = NULL, *ifacename = NULL, *server; -+ int port = 20001; -+ -+ while ((option = getopt(argc, argv, "?hvw:i:d:")) != -1) { -+ switch (option) { -+ case 'v': -+ verbose = 1; -+ break; -+ case 'w': -+ wifiiface = optarg; -+ break; -+ case 'i': -+ ifacename = optarg; -+ break; -+ case 'd': -+ delay = atoi(optarg); -+ break; -+ case '?': -+ case 'h': -+ usage(); -+ exit(1); -+ } -+ } -+ -+ if (optind < argc) { -+ server = argv[optind]; -+ optind++; -+ } else { -+ usage(); -+ exit(-1); -+ } -+ if (optind < argc) -+ port = atoi(argv[optind]); -+ -+ scan_wifi(wifiiface, ifacename, server, port); -+ -+ return 0; -+} diff --git a/recipes-fixes/wireless-tools/files/wifi2udp.service b/recipes-fixes/wireless-tools/files/wifi2udp.service deleted file mode 100644 index 1f3712e6f9..0000000000 --- a/recipes-fixes/wireless-tools/files/wifi2udp.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=WIFI scan service - -[Service] -EnvironmentFile=/etc/default/odu_gps.conf -ExecStartPre=/sbin/ifconfig wlan0 up -ExecStart=/usr/sbin/wifi2udp -w wlan0 -i eth0 ${UDP_SINK} -Restart=always -RestartSec=2 diff --git a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc b/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc deleted file mode 100644 index 590d809c20..0000000000 --- a/recipes-fixes/wireless-tools/wireless-tools_sysmocom.inc +++ /dev/null @@ -1,21 +0,0 @@ -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/files"], d)}:" - -PRINC="8" - -SRC_URI += "file://0001-Add-wifi2udp-program.patch \ - file://wifi2udp.service" - -PACKAGES =+ "wireless-tools-wifi2udp" - -FILES_wireless-tools-wifi2udp = "${sbindir}/wifi2udp \ - ${systemd_unitdir}/system/wifi2udp.service \ - ${systemd_unitdir}/system/multi-user.target.wants/wifi2udp.service" - -do_install_append() { - install -m 0755 wifi2udp ${D}${sbindir}/wifi2udp - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/wifi2udp.service ${D}${systemd_unitdir}/system/ - install -d ${D}${systemd_unitdir}/system/multi-user.target.wants/ - ln -sf ../wifi2udp.service ${D}${systemd_unitdir}/system/multi-user.target.wants/ -} diff --git a/yocto-dizzy/wireless-tools_30.pre9.bbappend b/yocto-dizzy/wireless-tools_30.pre9.bbappend deleted file mode 100644 index ddc8865d5c..0000000000 --- a/yocto-dizzy/wireless-tools_30.pre9.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/wireless-tools/${PN}_sysmocom.inc From b271d3128205bd9d33564cb209188fb3eb62b671 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Thu, 19 Mar 2015 21:41:46 +0100 Subject: [PATCH 4/6] ntp: add pool.ntp.org back as default ntp server for ntpdate Fixes: SYS#1185 --- recipes-bsp/ntp/files/ntpdate.default | 2 +- recipes-bsp/ntp/ntp_4.2.8p1.bb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-bsp/ntp/files/ntpdate.default b/recipes-bsp/ntp/files/ntpdate.default index 486b6e07d3..70c309f857 100644 --- a/recipes-bsp/ntp/files/ntpdate.default +++ b/recipes-bsp/ntp/files/ntpdate.default @@ -1,6 +1,6 @@ # Configuration script used by ntpdate-sync script -NTPSERVERS="" +NTPSERVERS="pool.ntp.org" # Set to "yes" to write time to hardware clock on success UPDATE_HWCLOCK="no" diff --git a/recipes-bsp/ntp/ntp_4.2.8p1.bb b/recipes-bsp/ntp/ntp_4.2.8p1.bb index 03e88efea0..cef3344e13 100644 --- a/recipes-bsp/ntp/ntp_4.2.8p1.bb +++ b/recipes-bsp/ntp/ntp_4.2.8p1.bb @@ -23,7 +23,7 @@ SRC_URI = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-${PV}.tar.g file://ntpd.list \ " -PR = "r6" +PR = "r7" SRC_URI[md5sum] = "65d8cdfae4722226fbe29863477641ed" SRC_URI[sha256sum] = "948274b88f1ed002d867ced6aaefdfd0999668b11285ac2b3a67ff2629d59d88" From 456f674b227fde48c7df7c629e448ae51fabcaca Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 27 Mar 2015 17:27:28 +0100 Subject: [PATCH 5/6] wireless-tools: Remove the hack for dora too Related: SYS#922 --- yocto-dora/wireless-tools_29.bbappend | 1 - 1 file changed, 1 deletion(-) delete mode 100644 yocto-dora/wireless-tools_29.bbappend diff --git a/yocto-dora/wireless-tools_29.bbappend b/yocto-dora/wireless-tools_29.bbappend deleted file mode 100644 index ddc8865d5c..0000000000 --- a/yocto-dora/wireless-tools_29.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-fixes/wireless-tools/${PN}_sysmocom.inc From 1f660fd4b00076baa867a75fdf766e8fe2c75b9d Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Fri, 27 Mar 2015 17:09:38 +0100 Subject: [PATCH 6/6] netbase/init-ifupdown: seperate both overrides and remove the appends of netbase for master and dizzy * historical netbase in edison was not split and files were in netbase Fixes: SYS#1142 --- .../init-ifupdown}/sysmobts-v1/interfaces | 0 .../init-ifupdown}/sysmobts-v2/interfaces | 0 .../init-ifupdown}/sysmocom-bsc/interfaces | 0 .../netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/init | 0 .../init-ifupdown}/sysmocom-idu/interfaces | 0 .../netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/init | 0 .../init-ifupdown}/sysmocom-odu/interfaces | 0 .../{netbase => init-ifupdown}/init-ifupdown_sysmocom.inc | 4 ++-- recipes-bsp/netbase/netbase_sysmocom.inc | 2 +- yocto-dizzy/netbase_5.3.bbappend | 1 - yocto-dora/init-ifupdown_1.0.bbappend | 2 +- yocto-master/netbase_5.1.bbappend | 1 - 12 files changed, 4 insertions(+), 6 deletions(-) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmobts-v1/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmobts-v2/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-bsc/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/init (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-idu/interfaces (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/init (100%) rename recipes-bsp/{netbase/netbase => init-ifupdown/init-ifupdown}/sysmocom-odu/interfaces (100%) rename recipes-bsp/{netbase => init-ifupdown}/init-ifupdown_sysmocom.inc (68%) delete mode 100644 yocto-dizzy/netbase_5.3.bbappend delete mode 100644 yocto-master/netbase_5.1.bbappend diff --git a/recipes-bsp/netbase/netbase/sysmobts-v1/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v1/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmobts-v1/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v1/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmobts-v2/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v2/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmobts-v2/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmobts-v2/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-bsc/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-bsc/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-bsc/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/init b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-idu/init rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/init diff --git a/recipes-bsp/netbase/netbase/sysmocom-idu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-idu/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-idu/interfaces diff --git a/recipes-bsp/netbase/netbase/sysmocom-odu/init b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-odu/init rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/init diff --git a/recipes-bsp/netbase/netbase/sysmocom-odu/interfaces b/recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/interfaces similarity index 100% rename from recipes-bsp/netbase/netbase/sysmocom-odu/interfaces rename to recipes-bsp/init-ifupdown/init-ifupdown/sysmocom-odu/interfaces diff --git a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc similarity index 68% rename from recipes-bsp/netbase/init-ifupdown_sysmocom.inc rename to recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc index 3850bb5b59..7ecf300b9c 100644 --- a/recipes-bsp/netbase/init-ifupdown_sysmocom.inc +++ b/recipes-bsp/init-ifupdown/init-ifupdown_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESEXTRAPATHS_prepend := "${SYSMOCOM}/netbase-${PV}:${SYSMOCOM}/netbase:" -PRINC = "9" +FILESEXTRAPATHS_prepend := "${SYSMOCOM}/init-ifupdown-${PV}:${SYSMOCOM}/init-ifupdown:" +PRINC = "10" # systemd does not look at /etc/rcS.d for the script. Make sure # there is a symlink available diff --git a/recipes-bsp/netbase/netbase_sysmocom.inc b/recipes-bsp/netbase/netbase_sysmocom.inc index 6f603eb1ca..2bdc67be9d 100644 --- a/recipes-bsp/netbase/netbase_sysmocom.inc +++ b/recipes-bsp/netbase/netbase_sysmocom.inc @@ -1,6 +1,6 @@ SYSMOCOM := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" FILESEXTRAPATHS_prepend := "${SYSMOCOM}/${PN}-${PV}:${SYSMOCOM}/${PN}:" -PRINC = "20" +PRINC = "21" # bug in poky meta/classes/base.bbclass diff --git a/yocto-dizzy/netbase_5.3.bbappend b/yocto-dizzy/netbase_5.3.bbappend deleted file mode 100644 index 5e3605ffef..0000000000 --- a/yocto-dizzy/netbase_5.3.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc diff --git a/yocto-dora/init-ifupdown_1.0.bbappend b/yocto-dora/init-ifupdown_1.0.bbappend index 5e3605ffef..486a6a7793 100644 --- a/yocto-dora/init-ifupdown_1.0.bbappend +++ b/yocto-dora/init-ifupdown_1.0.bbappend @@ -1 +1 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc +require recipes-bsp/init-ifupdown/${PN}_sysmocom.inc diff --git a/yocto-master/netbase_5.1.bbappend b/yocto-master/netbase_5.1.bbappend deleted file mode 100644 index 5e3605ffef..0000000000 --- a/yocto-master/netbase_5.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -require recipes-bsp/netbase/${PN}_sysmocom.inc