aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--contrib/freebsd/Makefile.am3
-rwxr-xr-xcontrib/freebsd/bsdify.sh3
3 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 5d3ed2cd..2cf56b28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,7 @@ sync-with-kernel:
! -f $(KERNEL_DIR)/include/uapi/linux/dvb/frontend.h -o \
! -f $(KERNEL_DIR)/include/uapi/linux/dvb/dmx.h -o \
! -f $(KERNEL_DIR)/include/uapi/linux/dvb/audio.h -o \
- ! -f $(KERNEL_DIR)/include/uapi/linux/dvb/video.h -o \
- ! -f $(KERNEL_DIR)/include/media/v4l2-chip-ident.h ]; then \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/dvb/video.h ]; then \
echo "Error you must set KERNEL_DIR to point to an extracted kernel source dir"; \
exit 1; \
fi
@@ -32,10 +31,8 @@ sync-with-kernel:
cp -a $(KERNEL_DIR)/include/uapi/linux/dvb/dmx.h $(top_srcdir)/include/linux/dvb
cp -a $(KERNEL_DIR)/include/uapi/linux/dvb/audio.h $(top_srcdir)/include/linux/dvb
cp -a $(KERNEL_DIR)/include/uapi/linux/dvb/video.h $(top_srcdir)/include/linux/dvb
- cp -a $(KERNEL_DIR)/include/media/v4l2-chip-ident.h $(top_srcdir)/include/media
$(MAKE) -C utils/keytable $@
- $(MAKE) -C utils/v4l2-dbg $@
$(MAKE) -C utils/xc3028-firmware $@
$(MAKE) -C lib/libdvbv5 $@
$(MAKE) -C contrib/freebsd $@
diff --git a/contrib/freebsd/Makefile.am b/contrib/freebsd/Makefile.am
index 45856bcc..8ad4c016 100644
--- a/contrib/freebsd/Makefile.am
+++ b/contrib/freebsd/Makefile.am
@@ -11,9 +11,6 @@ sync-with-kernel:
cp $(KERNEL_DIR)/include/uapi/linux/$$i include/linux/$$i; \
done
- mkdir -p include/media
- cp $(KERNEL_DIR)/include/media/v4l2-chip-ident.h include/media/
-
for i in ivtv.h uinput.h videodev2.h dvb/{audio.h,ca.h,dmx.h,frontend.h,net.h,osd.h,version.h,video.h}; do \
sed -e 's/__u8/uint8_t/g' -e 's/__u16/uint16_t/g' -e 's/__u32/uint32_t/g' -e 's/__u64/uint64_t/g' -e 's/__s8/int8_t/g' -e 's/__s16/int16_t/g' -e 's/__s32/int32_t/g' -e 's/__s64/int64_t/g' -e 's/__le32/uint32_t/g' -e 's/__user//g' -i include/linux/$$i; \
done
diff --git a/contrib/freebsd/bsdify.sh b/contrib/freebsd/bsdify.sh
index 6547b618..d4652cb5 100755
--- a/contrib/freebsd/bsdify.sh
+++ b/contrib/freebsd/bsdify.sh
@@ -33,9 +33,6 @@ for i in input.h ivtv.h uinput.h videodev2.h v4l2-controls.h v4l2-common.h dvb/{
cp $KERNEL_DIR/include/uapi/linux/$i include/linux/$i
done
-mkdir -p include/media
-cp $KERNEL_DIR/include/media/v4l2-chip-ident.h include/media/
-
# replace kernel types
for i in ivtv.h uinput.h videodev2.h dvb/{audio.h,ca.h,dmx.h,frontend.h,net.h,osd.h,version.h,video.h}; do

Privacy Policy