Skip to content

[multi-asic] Fixed systemd-sonic-generator for multi-asic #7633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
theasianpianist merged 3 commits into from
May 28, 2021
Merged

[multi-asic] Fixed systemd-sonic-generator for multi-asic #7633

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b6654a
Fixed systemd-sonic-generator for multi-asic
anamehra May 17, 2021
83638cf
Resolved review comments.
anamehra May 18, 2021
c079042
Merged strtok_r statements in single command.
anamehra May 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/systemd-sonic-generator/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
systemd-sonic-generator
ssg_test
debian/*
!debian/changelog
!debian/compat
Expand Down
22 changes: 21 additions & 1 deletion src/systemd-sonic-generator/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
CC=gcc
CFLAGS=-std=gnu99
CFLAGS=-std=gnu99 -D_GNU_SOURCE

CPP=g++
CPPFLAGS=-std=c++11 -D_GNU_SOURCE
LFLAGS=-lpthread -lboost_filesystem -lboost_system
GTEST=/usr/lib/x86_64-linux-gnu/libgtest.a

BINARY = systemd-sonic-generator
MAIN_TARGET = $(BINARY)_1.0.0_$(CONFIGURED_ARCH).deb
Expand All @@ -20,3 +25,18 @@ install: $(BINARY)
mkdir -p $(DESTDIR)/lib/systemd
mkdir -p $(DESTDIR)/lib/systemd/system-generators
cp ./systemd-sonic-generator $(DESTDIR)/lib/systemd/system-generators

.PHONY: test
test: ssg_test
./ssg_test

ssg_test: ssg-test.cc systemd-sonic-generator.o
$(CPP) $(CPPFLAGS) -o $@ $^ $(GTEST) $(LFLAGS)

systemd-sonic-generator.o: systemd-sonic-generator.c
$(CC) $(CFLAGS) -D_SSG_UNITTEST -o $@ -c $^

clean:
rm -f ./systemd-sonic-generator
rm -f ./systemd-sonic-generator.o
rm -f ./ssg_test
1 change: 0 additions & 1 deletion src/systemd-sonic-generator/debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ PACKAGEVERSION = $(VERSION)
dh $@

override_dh_auto_clean:
override_dh_auto_test:
override_dh_auto_build:
override_dh_auto_install:
make systemd-sonic-generator
Expand Down
Loading