diff options
| author | lijia <[email protected]> | 2020-04-28 19:55:50 +0800 |
|---|---|---|
| committer | lijia <[email protected]> | 2020-04-28 19:55:50 +0800 |
| commit | 916572de28235e5abc53bbd7fbe44b781182ff4f (patch) | |
| tree | 46476c84c3820081713f9bfbcccc4b4efed8f8a4 | |
| parent | f4d006b3971cb7d680367e1b70ae0489e7e4e499 (diff) | |
禁用rpm安装时对各种依赖库的检查, 避免: "error: Failed dependencies" 错误.
| -rw-r--r-- | cmake/Package.cmake | 6 | ||||
| -rw-r--r-- | test/test_app_sapp.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Package.cmake b/cmake/Package.cmake index a4e2814..6b9bb78 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -17,7 +17,7 @@ execute_process(COMMAND bash -c "echo -ne \"`uname -r | awk -F'.' '{print $5\".\ # RPM Build set(CPACK_GENERATOR "RPM") set(CPACK_RPM_PACKAGE_VENDOR "MESA") -set(CPACK_RPM_PACKAGE_AUTOREQPROV "yes") +set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") set(CPACK_RPM_PACKAGE_RELEASE_LIBRARY "on") set(CPACK_RPM_DEBUGINFO_PACKAGE "on") set(CPACK_RPM_PACKAGE_DEBUG 1) @@ -27,7 +27,7 @@ set(CPACK_COMPONENTS_IGNORE_GROUPS 1) set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP) set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop") -set(CPACK_COMPONENT_EXECUTABLE_REQUIRED TRUE) +set(CPACK_COMPONENT_EXECUTABLE_REQUIRED FALSE) set(CPACK_RPM_EXECUTABLE_PACKAGE_NAME ${MY_RPM_NAME_PREFIX}) set(CPACK_RPM_EXECUTABLE_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_RPM_EXECUTABLE_DEBUGINFO_FILE_NAME "${CPACK_RPM_EXECUTABLE_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") @@ -36,7 +36,7 @@ set(CPACK_COMPONENT_EXECUTABLE_GROUP "executable") set(CPACK_COMPONENT_LIBRARY_GROUP "executable") set(CPACK_COMPONENT_PROFILE_GROUP "executable") -set(CPACK_COMPONENT_HEADER_REQUIRED TRUE) +set(CPACK_COMPONENT_HEADER_REQUIRED FALSE) set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel") set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm") diff --git a/test/test_app_sapp.c b/test/test_app_sapp.c index 90e69d5..c5d1a6d 100644 --- a/test/test_app_sapp.c +++ b/test/test_app_sapp.c @@ -1418,7 +1418,7 @@ static void test_inject_tcp_pkt_with_this_hdr(struct streaminfo *stream,void **p raw_tcp_payload_len = ntohs(raw_ihdr->ip_len) - raw_ihdr->ip_hl*4 - raw_thdr->th_off * 4; /* 当前包是C2S方向的GET, 需要回复一个虚假的S2C方向的RESPONSE */ - send_ihdr = pkt_header_payload; + send_ihdr = (struct mesa_ip4_hdr *)pkt_header_payload; send_thdr = (struct mesa_tcp_hdr *)((char *)send_ihdr + sizeof(struct mesa_ip4_hdr)); sendpacket_build_tcp(ntohs(raw_thdr->th_dport), @@ -1447,8 +1447,8 @@ static void test_inject_tcp_pkt_with_this_hdr(struct streaminfo *stream,void **p fake_http_data, sizeof(fake_http_data)); - sendpacket_do_checksum(send_ihdr, IPPROTO_IP, sizeof(struct mesa_ip4_hdr)); - sendpacket_do_checksum(send_ihdr, IPPROTO_TCP, sizeof(struct mesa_tcp_hdr) + sizeof(fake_http_data)); + sendpacket_do_checksum((unsigned char *)send_ihdr, IPPROTO_IP, sizeof(struct mesa_ip4_hdr)); + sendpacket_do_checksum((unsigned char *)send_ihdr, IPPROTO_TCP, sizeof(struct mesa_tcp_hdr) + sizeof(fake_http_data)); send_pkt_len = sizeof(struct mesa_ip4_hdr) + sizeof(struct mesa_tcp_hdr) + sizeof(fake_http_data); |