From 2af6b9f8a3270c8ddb906f455ae716dfcd6f8a33 Mon Sep 17 00:00:00 2001 From: Brandon Kim Date: Wed, 28 Apr 2021 21:53:04 -0700 Subject: meta-quanta: gsj: Update mac-address to use meta-common meta-gsj is using SRCREV = "${AUTOREV}" which is outdated. Instead, use the bitbake from meta-common similar to meta-gbs. Signed-off-by: Brandon Kim Change-Id: I7c05b04987d10382329e7e813e71d0d79f2c4b9e --- meta-quanta/meta-gsj/recipes-gsj/mac-address/files/config.txt | 7 ------- .../recipes-gsj/mac-address/files/mac-address.service | 11 ----------- .../recipes-quanta/network/mac-address/mac-address/config.txt | 7 +++++++ .../meta-gsj/recipes-quanta/network/mac-address_%.bbappend | 10 ++++++++++ 4 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 meta-quanta/meta-gsj/recipes-gsj/mac-address/files/config.txt delete mode 100644 meta-quanta/meta-gsj/recipes-gsj/mac-address/files/mac-address.service create mode 100644 meta-quanta/meta-gsj/recipes-quanta/network/mac-address/mac-address/config.txt create mode 100644 meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend (limited to 'meta-quanta/meta-gsj') diff --git a/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/config.txt b/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/config.txt deleted file mode 100644 index 668b1d485b..0000000000 --- a/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/config.txt +++ /dev/null @@ -1,7 +0,0 @@ -fruBusNum=10 -fruAddr=0x55 -numberMac=4 -mac1=eth1 -mac2=usb0_dev -mac3=usb0_host -mac4=eth0 diff --git a/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/mac-address.service b/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/mac-address.service deleted file mode 100644 index e18d69493a..0000000000 --- a/meta-quanta/meta-gsj/recipes-gsj/mac-address/files/mac-address.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Initialize MAC Address -Before=usb_network.service network-pre.target -Wants=network-pre.target - -[Service] -Type=oneshot -ExecStart=/usr/bin/mac-address - -[Install] -WantedBy=multi-user.target \ No newline at end of file diff --git a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address/mac-address/config.txt b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address/mac-address/config.txt new file mode 100644 index 0000000000..668b1d485b --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address/mac-address/config.txt @@ -0,0 +1,7 @@ +fruBusNum=10 +fruAddr=0x55 +numberMac=4 +mac1=eth1 +mac2=usb0_dev +mac3=usb0_host +mac4=eth0 diff --git a/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend new file mode 100644 index 0000000000..a90150b3d5 --- /dev/null +++ b/meta-quanta/meta-gsj/recipes-quanta/network/mac-address_%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend_gsj := "${THISDIR}/${PN}:" +SRC_URI_append_gsj = " file://config.txt" + +FILES_${PN}_append_gsj = " ${datadir}/mac-address/config.txt" + +do_install_append_gsj() { + install -d ${D}${datadir}/mac-address + install -m 0644 -D ${WORKDIR}/config.txt \ + ${D}${datadir}/mac-address/config.txt +} -- cgit v1.2.3