Skip to content

Commit 8f76bdb

Browse files
committed
Fix build error
1 parent 32e620f commit 8f76bdb

4 files changed

Lines changed: 7 additions & 13 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9
1+
13

devops/build/packaging/deb/ubuntu22.04/rules

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,9 @@ include /usr/share/dpkg/default.mk
2020

2121
gpinstall:
2222
make install DESTDIR=${DEBIAN_DESTINATION} prefix=
23-
# Copy Apache compliance files
24-
mkdir -p ${DEBIAN_DESTINATION}${CBDB_BIN_PATH}
25-
cp -a LICENSE NOTICE DISCLAIMER ${DEBIAN_DESTINATION}${CBDB_BIN_PATH}/
26-
cp -a licenses ${DEBIAN_DESTINATION}${CBDB_BIN_PATH}/
23+
# Copy Apache compliance files into the build staging directory
24+
cp -a LICENSE NOTICE DISCLAIMER ${DEBIAN_DESTINATION}/
25+
cp -a licenses ${DEBIAN_DESTINATION}/
2726
# Create debian/copyright for Debian policy compliance
2827
mkdir -p $(shell pwd)/debian
2928
cat LICENSE NOTICE > $(shell pwd)/debian/copyright

devops/build/packaging/rpm/apache-cloudberry-db-incubating.spec

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,6 @@ ln -sfn %{cloudberry_install_dir}-%{version} %{buildroot}%{cloudberry_install_di
165165
%{prefix}-%{version}
166166
%{prefix}
167167

168-
%license %{cloudberry_install_dir}-%{version}/LICENSE
169-
%doc %{cloudberry_install_dir}-%{version}/NOTICE
170-
%doc %{cloudberry_install_dir}-%{version}/DISCLAIMER
171-
%{cloudberry_install_dir}-%{version}/licenses/
172-
173168
%debug_package
174169

175170
%post

devops/build/packaging/rpm/build-rpm.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ mkdir -p ~/rpmbuild/SOURCES
128128
# Find project root (assumed to be four levels up from scripts directory: devops/build/packaging/rpm/)
129129
PROJECT_ROOT="$(cd "$(dirname "$0")/../../../../" && pwd)"
130130

131+
# Define the target spec file path
132+
SPEC_FILE=~/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
133+
131134
# Copy the spec file to rpmbuild/SPECS if the source exists and is different
132135
if [ -f "$SOURCE_SPEC_FILE" ]; then
133136
# Avoid copying if SPEC_FILE is already a symlink/file pointing to SOURCE_SPEC_FILE (common in CI)
@@ -154,9 +157,6 @@ else
154157
echo "Warning: licenses directory not found in $PROJECT_ROOT"
155158
fi
156159

157-
# Define the target spec file path
158-
SPEC_FILE=~/rpmbuild/SPECS/apache-cloudberry-db-incubating.spec
159-
160160
# Check if the spec file exists at the target location before proceeding
161161
if [ ! -f "$SPEC_FILE" ]; then
162162
echo "Error: Spec file not found at $SPEC_FILE."

0 commit comments

Comments
 (0)