From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 01/11] Drop motion add-on Date: Mon, 17 May 2021 23:51:17 +0200 Message-ID: In-Reply-To: <873a3221-82d5-1516-51e3-ffa1b37ef992@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7374009115903149813==" List-Id: --===============7374009115903149813== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable As discussed in https://wiki.ipfire.org/devel/telco/2021-05-03. Signed-off-by: Peter M=C3=BCller --- config/backup/includes/motion | 1 - config/rootfiles/packages/motion | 44 ------------- lfs/motion | 102 ------------------------------- make.sh | 1 - 4 files changed, 148 deletions(-) delete mode 100644 config/backup/includes/motion delete mode 100644 config/rootfiles/packages/motion delete mode 100644 lfs/motion diff --git a/config/backup/includes/motion b/config/backup/includes/motion deleted file mode 100644 index 79652aa30..000000000 --- a/config/backup/includes/motion +++ /dev/null @@ -1 +0,0 @@ -/etc/motion.conf diff --git a/config/rootfiles/packages/motion b/config/rootfiles/packages/mot= ion deleted file mode 100644 index f93b24a91..000000000 --- a/config/rootfiles/packages/motion +++ /dev/null @@ -1,44 +0,0 @@ -etc/motion -etc/motion.conf -etc/motion/camera1-dist.conf -etc/motion/camera2-dist.conf -etc/motion/camera3-dist.conf -etc/motion/camera4-dist.conf -#etc/motion/motion-dist.conf -etc/rc.d/init.d/motion -etc/rc.d/rc0.d/K01motion -etc/rc.d/rc6.d/K01motion -etc/rc.d/rc3.d/S99motion -usr/bin/motion -#usr/share/doc/motion -#usr/share/doc/motion/COPYING -#usr/share/doc/motion/CREDITS -#usr/share/doc/motion/mask1.png -#usr/share/doc/motion/motion_build.html -#usr/share/doc/motion/motion_config.html -#usr/share/doc/motion/motion_guide.html -#usr/share/doc/motion/motion_stylesheet.css -#usr/share/doc/motion/normal.jpg -#usr/share/doc/motion/outputmotion1.jpg -#usr/share/doc/motion/outputnormal1.jpg -#usr/share/locale/da/LC_MESSAGES/motion.mo -#usr/share/locale/de/LC_MESSAGES/motion.mo -#usr/share/locale/es/LC_MESSAGES/motion.mo -#usr/share/locale/fi/LC_MESSAGES/motion.mo -#usr/share/locale/fr/LC_MESSAGES/motion.mo -#usr/share/locale/it/LC_MESSAGES/motion.mo -#usr/share/locale/ja/LC_MESSAGES/motion.mo -#usr/share/locale/ko/LC_MESSAGES/motion.mo -#usr/share/locale/li -#usr/share/locale/li/LC_MESSAGES -#usr/share/locale/li/LC_MESSAGES/motion.mo -#usr/share/locale/nl/LC_MESSAGES/motion.mo -#usr/share/locale/no -#usr/share/locale/no/LC_MESSAGES -#usr/share/locale/no/LC_MESSAGES/motion.mo -#usr/share/locale/pt/LC_MESSAGES/motion.mo -#usr/share/locale/sk/LC_MESSAGES/motion.mo -#usr/share/locale/sv/LC_MESSAGES/motion.mo -#usr/share/locale/zh/LC_MESSAGES/motion.mo -#usr/share/man/man1/motion.1 -var/ipfire/backup/addons/includes/motion diff --git a/lfs/motion b/lfs/motion deleted file mode 100644 index 4197fd1f5..000000000 --- a/lfs/motion +++ /dev/null @@ -1,102 +0,0 @@ -############################################################################= ### -# = # -# IPFire.org - A linux based firewall = # -# Copyright (C) 2007-2020 IPFire Team = # -# = # -# This program is free software: you can redistribute it and/or modify = # -# it under the terms of the GNU General Public License as published by = # -# the Free Software Foundation, either version 3 of the License, or = # -# (at your option) any later version. = # -# = # -# This program is distributed in the hope that it will be useful, = # -# but WITHOUT ANY WARRANTY; without even the implied warranty of = # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # -# GNU General Public License for more details. = # -# = # -# You should have received a copy of the GNU General Public License = # -# along with this program. If not, see . = # -# = # -############################################################################= ### - -############################################################################= ### -# Definitions -############################################################################= ### - -include Config - -VER =3D 4.3.0 - -THISAPP =3D motion-Release-$(VER) -DL_FILE =3D $(THISAPP).tar.gz -DL_FROM =3D $(URL_IPFIRE) -DIR_APP =3D $(DIR_SRC)/$(THISAPP) -TARGET =3D $(DIR_INFO)/$(THISAPP) - -PROG =3D motion -PAK_VER =3D 3 -DEPS =3D ffmpeg libmicrohttpd - -CFLAGS +=3D -fcommon - -############################################################################= ### -# Top-level Rules -############################################################################= ### - -objects =3D $(DL_FILE) - -$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 =3D 297aab6ec3de74ce1a0d2b1711ac9062 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################= ### -# Downloading, checking, md5sum -############################################################################= ### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -dist:=20 - @$(PAK) - -############################################################################= ### -# Installation Details -############################################################################= ### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - - #Install obsolete V4L1 videodev.h - cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videode= v.h - - cd $(DIR_APP) && autoreconf -fiv - - cd $(DIR_APP) && ./configure --prefix=3D/usr --sysconfdir=3D/etc - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - cp -vf $(DIR_SRC)/config/motion/motion.conf /etc - install -v -m 644 $(DIR_SRC)/config/backup/includes/motion \ - /var/ipfire/backup/addons/includes/motion - - #Remove obsolete V4L1 videodev.h - rm -f /usr/include/linux/videodev.h - - #install initscripts - $(call INSTALL_INITSCRIPT,motion) - - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/make.sh b/make.sh index 4af0081e9..4cf58dff8 100755 --- a/make.sh +++ b/make.sh @@ -1513,7 +1513,6 @@ buildipfire() { lfsmake2 perl-File-ReadBackwards lfsmake2 openvmtools lfsmake2 libmicrohttpd - lfsmake2 motion lfsmake2 joe lfsmake2 monit lfsmake2 nut --=20 2.26.2 --===============7374009115903149813==--