Skip to content

Commit b235a52

Browse files
committed
Move scripts and sources to sub directories
No functional changes. Change-Id: I2564bb309dc6bdff245b5689f49c6065e61b91c3 Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
1 parent e73f573 commit b235a52

10 files changed

+14
-15
lines changed

debian/rules

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ override_dh_clean:
1212

1313
override_dh_auto_configure:
1414
for target in $(TARGETS); do \
15-
export $$(./parse_name.sh $$target); \
15+
export $$(scripts/parse_name.sh $$target); \
1616
dh_auto_configure --builddirectory=$$name -- \
1717
-Darch=$${target%%-*} -Dgpu=$$gpu \
1818
-Dversion=$$version -Dsubversion=$$subversion \
@@ -24,7 +24,7 @@ override_dh_auto_test:
2424

2525
override_dh_auto_install:
2626
for target in $(TARGETS); do \
27-
export $$(./parse_name.sh $$target); \
27+
export $$(scripts/parse_name.sh $$target); \
2828
dh_auto_install --builddirectory=$$name \
2929
--destdir=debian/$$name; \
3030
done

meson.build

+8-9
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ optimize = get_option('optimize-level')
2626
message('Building for ' + '|'.join([arch, gpu, version, subversion, platform, optimize]))
2727

2828
# Grab libraries with specified configs
29-
cmd = run_command('grabber.sh', arch, gpu, version, subversion, platform, optimize)
29+
cmd = run_command('scripts/grabber.sh', arch, gpu, version, subversion, platform, optimize)
3030
libs = cmd.stdout().strip().split('\n')
3131

3232
# Use the first one as default library
@@ -180,7 +180,7 @@ if run_command('grep', '-q', gbm_symbol, default_lib).returncode() == 0
180180
libdl_dep = meson.get_compiler('c').find_library('dl', required : false)
181181
libgbm = shared_library(
182182
'gbm',
183-
'gbm_wrapper.c',
183+
'src/gbm_wrapper.c',
184184
c_args : libgbm_cflags,
185185
include_directories : include_directories('include/GBM'),
186186
dependencies : [libdl_dep, libdrm_dep],
@@ -281,16 +281,15 @@ endif
281281
# Install target libraries
282282
install_data(libs, install_dir : get_option('libdir'))
283283

284-
# Fixup dummy library
285-
meson.add_install_script('fixup_dummy.sh', get_option('libdir'), default_lib)
284+
# Replace dummy libmali library
285+
meson.add_install_script('scripts/fixup_dummy.sh', get_option('libdir'), default_lib)
286286

287287
if not wrappers
288-
# Fixup wrappers
289-
meson.add_install_script('fixup_wrappers.sh', get_option('libdir'))
288+
# Disable wrappers
289+
meson.add_install_script('scripts/fixup_nowrap.sh', get_option('libdir'))
290290
endif
291291

292292
if platform != 'x11' and not vendor_package
293-
# Fixup EGL header
294-
meson.add_install_script('fixup_nox11.sh',
295-
get_option('includedir') / 'EGL' / 'eglplatform.h')
293+
# Disable X11 in EGL header
294+
meson.add_install_script('scripts/fixup_nox11.sh', get_option('includedir'))
296295
endif
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/sh -e
22

33
[ $# -lt 1 ] && {
4-
echo "usage: $0 <path of eglplatform.h>"
4+
echo "usage: $0 <path of include>"
55
exit 1
66
}
77

8-
HEADER="${MESON_INSTALL_DESTDIR_PREFIX:-/usr}/$1"
8+
HEADER="${MESON_INSTALL_DESTDIR_PREFIX:-/usr}/$1/EGL/eglplatform.h"
99

1010
[ -f "$HEADER" ] && \
1111
sed -i 's/MESA_EGL_NO_X11_HEADERS/__unix__/g' "$HEADER"
File renamed without changes.

normalize.sh renamed to scripts/normalize.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ for lib in $LIBS; do
2323
done
2424

2525
# Update debian control and rules
26-
./update_debian.sh
26+
scripts/update_debian.sh
File renamed without changes.

update_debian.sh renamed to scripts/update_debian.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rm -f control.*
99

1010
# NOTE: Assuming multiarch packages could share debian files
1111
for target in $TARGETS; do
12-
#export $(./parse_name.sh $target)
12+
#export $(scripts/parse_name.sh $target)
1313
#package=$name
1414
package=$(basename ${target%.so})
1515
control=control.$package
File renamed without changes.

0 commit comments

Comments
 (0)