Age | Commit message (Collapse) | Author | Files | Lines |
|
Add distro override to avoid os-release setting effect other
not gbmc distro
Signed-off-by: Brian Ma <chma0@nuvoton.com>
Change-Id: I34afb4ce8e72f2be15a5f5668e6ff6c567548ad5
|
|
Add dev/prod image type to /etc/os-release.
Tested:
Built with GBMC_CONFIG=dev bitbake obmc-phosphor-image
```
cat /etc/os-release
ID=gbmc
NAME="gBMC (OpenBMC + Google customizations)"
VERSION="gbmc-release"
VERSION_ID=gbmc-release-0.5.0.0
PRETTY_NAME="gBMC (OpenBMC + Google customizations) gbmc-release"
BUILD_ID="2.11.0-dev"
IMAGE_TYPE="dev"
```
Change-Id: I355e6069b08107717fb406b6b603ce4ce5264ff3
Signed-off-by: Willy Tu <wltu@google.com>
|
|
```
convert-overrides.py meta-google
git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb"
git grep -l _gbmc -- meta-google | grep ".bb" \
| xargs sed -i 's/_gbmc/:gbmc/'
git grep -l _prod -- meta-google | grep ".bb" \
| xargs sed -i 's/_prod/:prod/'
git grep -l _dev -- meta-google | grep ".bb" \
| xargs sed -i 's/_dev/:dev/'
git grep -l _hoth -- meta-google | grep ".bb" \
| xargs sed -i 's/_hoth/:hoth/'
git grep -l _bandaid -- meta-google | grep ".bb" \
| xargs sed -i 's/_bandaid/:bandaid/'
```
Some small fix includes
```
platforms_gbmc_bringup
platforms_gbmc_secure
```
Tested:
```
$ git grep "_[a-z0-9_/-]*[ :]" -- meta-google | grep ".bb"
meta-google/recipes-connectivity/avahi/avahi_%.bbappend:do_install:append:gbmc() {
meta-google/recipes-core/dropbear/dropbear_%.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-core/dropbear/dropbear_%.bbappend: echo ' chain gbmc_br_pub_input {' >>"$rules"
meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake checker
meta-google/recipes-extended/libconfig/conf2struct-native_git.bb: oe_runmake install
meta-google/recipes-extended/networking/mstpd_git.bb:do_install:append() {
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake distclean
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake sslh-conf.h
meta-google/recipes-extended/networking/sslh_git.bb: oe_runmake install
meta-google/recipes-google/ipmi/ipmi-fru-sh.bb:do_install:append() {
meta-google/recipes-google/ncsi/gbmc-ncsi-config.bb:do_install:append() {
meta-google/recipes-google/networking/gbmc-bridge.bb:do_rm_work:prepend() {
meta-google/recipes-google/networking/gbmc-bridge.bb: # HACK: Work around broken do_rm_work not properly calling rm with `--`
meta-google/recipes-google/networking/gbmc-ip-monitor.bb:do_install:append() {
meta-google/recipes-google/networking/gbmc-iperf3.bb:do_install:append:dev() {
meta-google/recipes-google/networking/gbmc-iperf3.bb: echo ' chain gbmc_br_pub_input {' >>"$rules"
meta-google/recipes-google/networking/gbmc-mac-config.bb:do_install:append() {
meta-google/recipes-google/networking/network-sh.bb:do_install:append() {
meta-google/recipes-google/ssh/authorized-keys-comp.bb:SUMMARY = "Compiles a set of authorized_keys files into a single file"
meta-google/recipes-google/ssh/authorized-keys-comp.bb:do_install:append() {
meta-google/recipes-google/systemd/gbmc-systemd-config.bb:do_install:append:dev() {
meta-google/recipes-google/test/test-sh.bb:do_install:append() {
meta-google/recipes-phosphor/flash/inplace-gbmc-update.bb:do_install:prepend:dev() {
meta-google/recipes-phosphor/host/phosphor-host-postd_%.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:dev() {
meta-google/recipes-phosphor/initrdscripts/obmc-phosphor-initfs.bbappend:do_install:append:gbmc:prod() {
meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend:do_install:append:gbmc() {
meta-google/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend: overlapping="$(jq '."${GBMCBR_IPMI_CHANNEL}" | .is_valid and .name != "gbmcbr"' $chjson)"
```
Change-Id: I9d610c664bd44e8bd81fb8f7e76249a0b43b9ffd
Signed-off-by: Willy Tu <wltu@google.com>
|
|
Fix inconsistent quotes.
Tested:
```
$ BUILD_MEMO="test build" MACHINE=gbmc bitbake obmc-phosphor-image
```
```
$ cat /etc/os-release
ID=gbmc
NAME="gBMC (OpenBMC + Google customizations)"
VERSION="gbmc-release"
VERSION_ID=gbmc-release-0.5.0.0
PRETTY_NAME="gBMC (OpenBMC + Google customizations) gbmc-release"
BUILD_ID="2.9.0-dev"
OPENBMC_TARGET_MACHINE="gbmc"
BUILD_MEMO="test build"
```
Change-Id: I119f730edc894ddaad830c201c6630eb83d11cc1
Signed-off-by: Willy Tu <wltu@google.com>
|
|
Add BUILD_MEMO to /etc/os-release. BUILD_MEMO only exists when
BUILD_MEMO is defined in the shell environment.
Tested:
BUILD_MEMO=$(date) MACHINE=gbmc bitbake obmc-phosphor-image
$ cat /etc/os-release
ID=gbmc
NAME="gBMC (OpenBMC + Google customizations)"
VERSION="2.9.0-dev"
VERSION_ID=gbmc-release-0.5.0.0
PRETTY_NAME="gBMC (OpenBMC + Google customizations) 2.9.0-dev"
BUILD_ID="2.9.0-dev"
OPENBMC_TARGET_MACHINE="gbmc"
OBMC_VERSION="v2.4-11142-gda2d3941e2"
BUILD_MEMO="Tue 02 Mar 2021 03:39:50 PM PST"
Google-Bug-Id: 180020976
Google-Bug-Id: 179617828
Signed-off-by: Yong Zhao <yozhao@google.com>
Signed-off-by: Willy Tu <wltu@google.com>
Change-Id: Ie041b897d6dbe31355edef958c6c97e44c91ea75
|