From 8ba8c03d0704cb6d762d6577e40016c4ba057035 Mon Sep 17 00:00:00 2001
From: jiangchengpeng <j00646285@china.huawei.com>
Date: Wed, 23 Apr 2025 16:25:20 +0800
Subject: [PATCH] [test][Not Merge] add compiling support for ubuntu22.04

---
 qingtian-tools/Makefile          |  2 +-
 qingtian-tools/qt-proxy/Makefile | 14 +++++++++++---
 virtio-qtbox/Makefile            |  6 ++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/qingtian-tools/Makefile b/qingtian-tools/Makefile
index b1b857e..742249d 100644
--- a/qingtian-tools/Makefile
+++ b/qingtian-tools/Makefile
@@ -8,7 +8,7 @@ LDFLAGS += `pkg-config --cflags --libs glib-2.0`
 VPATH = src:include
 
 CC := gcc
-LIBS := -lgnutls -lnettle -lcjson
+LIBS := -lgnutls -lnettle -lcjson -lglib-2.0
 INC := -I./include
 OBJS := qt-enclave
 objects = util.o image.o enclave.o cli.o logger.o
diff --git a/qingtian-tools/qt-proxy/Makefile b/qingtian-tools/qt-proxy/Makefile
index 2cd49ac..4f0f146 100644
--- a/qingtian-tools/qt-proxy/Makefile
+++ b/qingtian-tools/qt-proxy/Makefile
@@ -1,9 +1,10 @@
 CFLAGS := -O2 -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wmissing-declarations -fno-strict-aliasing
 CFLAGS += -Werror -Wformat -Wformat-security -D_GNU_SOURCE -fPIC -fstack-protector-strong -fno-common
-CFLAGS  += `pkg-config --cflags glib-2.0`
+CFLAGS  += `pkg-config --cflags --libs glib-2.0`
 
 LDFLAGS := -fPIE -pie -Wl,-z,relro,-z,now -Wl,-z,noexecstack,-s
-LDFLAGS += `pkg-config --libs glib-2.0`
+LDFLAGS += `pkg-config --cflags --libs glib-2.0`
+LIBS := -lglib-2.0
 
 CC := gcc
 
@@ -19,7 +20,7 @@ objects := $(SRCS:.c=.o)
 	$(CC) $(CFLAGS) $(INC) -o $@ -c $<
 
 $(OBJS): $(objects)
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC) $(LDFLAGS) -o $@ $(objects) $(LIBS)
 
 CLEANFILES := $(objects) $(OBJS)
 
@@ -27,5 +28,12 @@ CLEANFILES := $(objects) $(OBJS)
 
 all: $(OBJS)
 
+install:
+	install -D -m 666 conf/qt_proxy_rsyslog.conf /etc/rsyslog.d/qt_proxy.conf
+	install -D -m 666 conf/qt_proxy.logrotate.in /etc/logrotate.d/qt_proxy
+	install -D -m 755 qt_proxy /usr/local/bin/qingtian/enclave/qt_proxy
+	install -D -m 755 scripts/qt-proxy etc/qingtian/enclave/qt-proxy
+	install -D -m 755 conf/qt-proxy.conf /etc/qingtian/enclave/qt-proxy.conf
+
 clean:
 	rm -f ${CLEANFILES}
diff --git a/virtio-qtbox/Makefile b/virtio-qtbox/Makefile
index 6e95b54..e76c983 100644
--- a/virtio-qtbox/Makefile
+++ b/virtio-qtbox/Makefile
@@ -16,5 +16,11 @@ PWD  := $(shell pwd)
 all:
 	$(MAKE) -C $(KDIR) M=$(PWD)
 
+install:
+	install -D -m 644 virtio-qtbox.ko /opt/qingtian/enclave/virtio-qtbox.ko
+
+uninstall:
+	rm -f /opt/qingtian/enclave/virtio-qtbox.ko
+
 clean:
 	$(MAKE) -C $(KDIR) M=$(PWD) clean
-- 
Gitee