jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 14:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixes and cleanups (Cristian Ionescu-Idbohrn)

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2007-09-19 20:13:08 +00:00
parent 7935c98db1
commit 7b0ad787d6
12 changed files with 157 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/libevent/libevent.mk
View File

@ -31,6 +31,7 @@ $(LIBEVENT_DIR)/.configured: $(LIBEVENT_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--prefix=/usr \ --prefix=/usr \
--mandir=/usr/share/man \
--disable-static \ --disable-static \
--with-gnu-ld \ --with-gnu-ld \
) )
@ -44,9 +45,11 @@ $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY): $(LIBEVENT_DIR)/$(LIBEVENT_BINARY)
$(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY): $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY) $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY): $(STAGING_DIR)/$(LIBEVENT_TARGET_BINARY)
$(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install $(MAKE) -C $(LIBEVENT_DIR) DESTDIR=$(TARGET_DIR) install
rm -f $(TARGET_DIR)/usr/lib/libevent*.la $(TARGET_DIR)/usr/include/ev* rm -f $(addprefix $(TARGET_DIR)/usr/,lib/libevent*.la \
rm -f $(TARGET_DIR)/usr/man/man3/ev*.3 include/ev*)
rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/man/man3 ifneq ($(BR2_HAVE_MANPAGES),y)
rm -fr $(TARGET_DIR)/usr/share/man
endif
libevent: uclibc $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY) libevent: uclibc $(TARGET_DIR)/$(LIBEVENT_TARGET_BINARY)

7
package/libgcrypt/libgcrypt.mk
View File

@ -42,8 +42,8 @@ $(LIBGCRYPT_DIR)/.configured: $(LIBGCRYPT_DIR)/.source
--datadir=/usr/share \ --datadir=/usr/share \
--localstatedir=/var \ --localstatedir=/var \
--includedir=/usr/include \ --includedir=/usr/include \
--mandir=/usr/man \ --mandir=/usr/share/man \
--infodir=/usr/info \ --infodir=/usr/share/info \
--disable-optimization \ --disable-optimization \
) )
touch $@ touch $@
@ -57,6 +57,9 @@ $(STAGING_DIR)/$(LIBGCRYPT_TARGET_LIBRARY): $(LIBGCRYPT_DIR)/$(LIBGCRYPT_LIBRARY
$(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGCRYPT_TARGET_LIBRARY) $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY): $(STAGING_DIR)/$(LIBGCRYPT_TARGET_LIBRARY)
cp -dpf $<* $(TARGET_DIR)/$(LIBGCRYPT_DESTDIR) cp -dpf $<* $(TARGET_DIR)/$(LIBGCRYPT_DESTDIR)
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(STAGING_DIR)/usr/share/info
endif
libgcrypt: uclibc libgpg-error $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY) libgcrypt: uclibc libgpg-error $(TARGET_DIR)/$(LIBGCRYPT_TARGET_LIBRARY)

29
package/liblockfile/liblockfile.mk
View File

@ -28,29 +28,38 @@ $(LIBLOCKFILE_DIR)/.configured: $(LIBLOCKFILE_DIR)/.unpacked
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \ --build=$(GNU_HOST_NAME) \
--prefix=/usr \
--bindir=/usr/bin \
--libdir=/usr/lib \
--includedir=/usr/include \
--mandir=/usr/share/man \
--enable-shared \ --enable-shared \
) )
touch $@ touch $@
$(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY): $(LIBLOCKFILE_DIR)/.configured
mkdir -p $(STAGING_DIR)/man/man1 $(STAGING_DIR)/man/man3 mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3)
$(MAKE) -C $(LIBLOCKFILE_DIR) prefix= ROOT=$(STAGING_DIR) install mkdir -p $(STAGING_DIR)/usr/share/man/man3
ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/lib/liblockfile.so.1 rm -f $(STAGING_DIR)/usr/lib/liblockfile.so
cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/lib $(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install
ln -sf $(LIBLOCKFILE_BINARY) $(STAGING_DIR)/usr/lib/liblockfile.so.1
cp -dpf $(LIBLOCKFILE_DIR)/liblockfile.a $(STAGING_DIR)/usr/lib
$(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY): $(STAGING_DIR)/lib/$(LIBLOCKFILE_BINARY)
mkdir -p $(TARGET_DIR)/usr/lib mkdir -p $(TARGET_DIR)/usr/lib
cp -a $(STAGING_DIR)/lib/liblockfile.so* $(TARGET_DIR)/usr/lib cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) \
$(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY) liblockfile: uclibc $(TARGET_DIR)/usr/lib/$(LIBLOCKFILE_BINARY)
liblockfile-clean: liblockfile-clean:
rm -f $(TARGET_DIR)/usr/lib/liblockfile.so* rm -f $(TARGET_DIR)/usr/lib/liblockfile.so*
rm -f $(STAGING_DIR)/lib/liblockfile* rm -f $(STAGING_DIR)/usr/lib/liblockfile*
rm -f $(STAGING_DIR)/usr/include/lockfile.h rm -f $(addprefix $(STAGING_DIR)/usr/include/,lockfile.h mailfile.h)
rm -f $(STAGING_DIR)/usr/include/mailfile.h ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(STAGING_DIR)/man rm -rf $(STAGING_DIR)/usr/share/man
endif
$(MAKE) -C $(LIBLOCKFILE_DIR) clean $(MAKE) -C $(LIBLOCKFILE_DIR) clean
liblockfile-dirclean: liblockfile-dirclean:

10
package/libsndfile/libsndfile.mk
View File

@ -36,17 +36,20 @@ $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY): $(LIBSNDFILE_DIR)/.configured
$(MAKE) CC=$(TARGET_CC) -C $(LIBSNDFILE_DIR) $(MAKE) CC=$(TARGET_CC) -C $(LIBSNDFILE_DIR)
$(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY): $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY) $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY): $(LIBSNDFILE_DIR)/$(LIBSNDFILE_BINARY)
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) install $(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) install
rm -Rf $(TARGET_DIR)/usr/man $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) install
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -Rf $(TARGET_DIR)/usr/share/man
rm -Rf $(STAGING_DIR)/usr/share/man
endif
libsndfile: uclibc $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY) libsndfile: uclibc $(TARGET_DIR)/$(LIBSNDFILE_TARGET_BINARY)
libsndfile-source: $(DL_DIR)/$(LIBSNDFILE_SOURCE) libsndfile-source: $(DL_DIR)/$(LIBSNDFILE_SOURCE)
libsndfile-clean: libsndfile-clean:
$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
$(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall $(MAKE) prefix=$(TARGET_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
-$(MAKE) prefix=$(STAGING_DIR)/usr -C $(LIBSNDFILE_DIR) uninstall
-$(MAKE) -C $(LIBSNDFILE_DIR) clean -$(MAKE) -C $(LIBSNDFILE_DIR) clean
libsndfile-dirclean: libsndfile-dirclean:
@ -60,4 +63,3 @@ libsndfile-dirclean:
ifeq ($(strip $(BR2_PACKAGE_LIBSNDFILE)),y) ifeq ($(strip $(BR2_PACKAGE_LIBSNDFILE)),y)
TARGETS+=libsndfile TARGETS+=libsndfile
endif endif

28
package/libtool/libtool.mk
View File

@ -46,8 +46,8 @@ $(LIBTOOL_DIR)/.configured: $(LIBTOOL_SRC_DIR)/.unpacked
--sysconfdir=/etc \ --sysconfdir=/etc \
--datadir=/usr/share \ --datadir=/usr/share \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/man \ --mandir=/usr/share/man \
--infodir=/usr/info \ --infodir=/usr/share/info \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
) )
touch $@ touch $@
@ -67,15 +67,21 @@ $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_DIR)/$(LIBTOOL_BINARY)
sysconfdir=$(TARGET_DIR)/etc \ sysconfdir=$(TARGET_DIR)/etc \
localstatedir=$(TARGET_DIR)/var \ localstatedir=$(TARGET_DIR)/var \
libdir=$(TARGET_DIR)/usr/lib \ libdir=$(TARGET_DIR)/usr/lib \
infodir=$(TARGET_DIR)/usr/info \ infodir=$(TARGET_DIR)/usr/share/info \
mandir=$(TARGET_DIR)/usr/man \ mandir=$(TARGET_DIR)/usr/share/man \
includedir=$(TARGET_DIR)/usr/include \ includedir=$(TARGET_DIR)/usr/include \
-C $(LIBTOOL_DIR) install -C $(LIBTOOL_DIR) install
$(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1 $(STRIP) $(TARGET_DIR)//usr/lib/libltdl.so.*.*.* > /dev/null 2>&1
$(SED) "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool $(SED) "s,^CC.*,CC=\"/usr/bin/gcc\"," $(TARGET_DIR)/usr/bin/libtool
$(SED) "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool $(SED) "s,^LD.*,LD=\"/usr/bin/ld\"," $(TARGET_DIR)/usr/bin/libtool
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ rm -rf $(TARGET_DIR)/share/locale
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc rm -rf $(TARGET_DIR)/usr/share/doc
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/info
endif
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
touch -c $@ touch -c $@
libtool: uclibc $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY) libtool: uclibc $(TARGET_DIR)/$(LIBTOOL_TARGET_BINARY)
@ -116,8 +122,14 @@ $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY): $(LIBTOOL_HOST_DIR)/.configured
$(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY) $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY): $(LIBTOOL_HOST_DIR)/$(LIBTOOL_BINARY)
$(MAKE) -C $(LIBTOOL_HOST_DIR) install $(MAKE) -C $(LIBTOOL_HOST_DIR) install
rm -rf $(STAGING_DIR)/share/locale $(STAGING_DIR)/usr/info \ rm -rf $(STAGING_DIR)/share/locale
$(STAGING_DIR)/usr/man $(STAGING_DIR)/usr/share/doc rm -rf $(STAGING_DIR)/usr/share/doc
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(STAGING_DIR)/usr/share/info
endif
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(STAGING_DIR)/usr/share/man
endif
touch -c $@ touch -c $@
host-libtool: $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY) host-libtool: $(STAGING_DIR)/$(LIBTOOL_TARGET_BINARY)

7
package/libvorbis/Config.in
View File

@ -8,9 +8,10 @@ config BR2_PACKAGE_LIBVORBIS
(8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and
variable bitrates from 16 to 128 kbps/channel. variable bitrates from 16 to 128 kbps/channel.
This places Vorbis in the same competitive class as audio representations This places Vorbis in the same competitive class as audio
such as MPEG-4 (AAC), and similar to, but higher performance than representations such as MPEG-4 (AAC), and similar to, but higher
MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), WMA and PAC. performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ),
WMA and PAC.
config BR2_PACKAGE_LIBVORBIS_HEADERS config BR2_PACKAGE_LIBVORBIS_HEADERS

13
package/libvorbis/libvorbis.mk
View File

@ -19,11 +19,13 @@ $(LIBVORBIS_DIR)/.source: $(DL_DIR)/$(LIBVORBIS_SOURCE)
touch $@ touch $@
$(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
(cd $(LIBVORBIS_DIR); rm -rf config.cache ; \ (cd $(LIBVORBIS_DIR); rm -rf config.cache; \
$(TARGET_CONFIGURE_ARGS) \ $(TARGET_CONFIGURE_ARGS) \
$(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" PKG_CONFIG_SYSROOT=$(STAGING_DIR) \ PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
./configure \ ./configure \
--target=$(GNU_TARGET_NAME) \ --target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \
@ -34,7 +36,7 @@ $(LIBVORBIS_DIR)/.configured: $(LIBVORBIS_DIR)/.source
--enable-static \ --enable-static \
--disable-oggtest \ --disable-oggtest \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
); )
touch $@ touch $@
$(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured $(LIBVORBIS_DIR)/.libs: $(LIBVORBIS_DIR)/.configured
@ -51,7 +53,8 @@ $(TARGET_DIR)/usr/lib/libvorbis.a: $(TARGET_DIR)/usr/lib/libvorbis.so
libvorbis-header: $(TARGET_DIR)/usr/lib/libvorbis.a libvorbis-header: $(TARGET_DIR)/usr/lib/libvorbis.a
mkdir -p $(TARGET_DIR)/usr/include/vorbis mkdir -p $(TARGET_DIR)/usr/include/vorbis
cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h $(TARGET_DIR)/usr/include/vorbis cp -dpf $(LIBVORBIS_DIR)/include/vorbis/*.h \
$(TARGET_DIR)/usr/include/vorbis
libvorbis: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libvorbis.so libvorbis: uclibc pkgconfig $(TARGET_DIR)/usr/lib/libvorbis.so
@ -80,7 +83,7 @@ TREMOR_SOURCE:=$(TREMOR_NAME).tar.bz2
$(DL_DIR)/$(TREMOR_SOURCE): $(DL_DIR)/$(TREMOR_SOURCE):
(cd $(BUILD_DIR); \ (cd $(BUILD_DIR); \
svn co $(TREMOR_TRUNK); \ svn co $(TREMOR_TRUNK); \
mv -af Tremor $(TREMOR_NAME); \ mv -f Tremor $(TREMOR_NAME); \
tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \ tar -cvf $(TREMOR_NAME).tar $(TREMOR_DIR); \
bzip2 $(TREMOR_NAME).tar; \ bzip2 $(TREMOR_NAME).tar; \
rm -fr $(TREMOR_DIR); \ rm -fr $(TREMOR_DIR); \

14
package/lighttpd/lighttpd.mk
View File

@ -14,11 +14,13 @@ LIGHTTPD_TARGET_BINARY:=usr/sbin/lighttpd
$(DL_DIR)/$(LIGHTTPD_SOURCE): $(DL_DIR)/$(LIGHTTPD_SOURCE):
$(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE) $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_SOURCE)
ifneq ($(LIGHTTPD_PATCH),) ifneq ($(LIGHTTPD_PATCH),)
LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH) LIGHTTPD_PATCH_FILE:=$(DL_DIR)/$(LIGHTTPD_PATCH)
$(LIGHTTPD_PATCH_FILE): $(LIGHTTPD_PATCH_FILE):
$(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH) $(WGET) -P $(DL_DIR) $(LIGHTTPD_SITE)/$(LIGHTTPD_PATCH)
endif endif
lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE) lighttpd-source: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_PATCH_FILE)
$(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE) $(LIGHTTPD_DIR)/.unpacked: $(DL_DIR)/$(LIGHTTPD_SOURCE)
@ -63,17 +65,21 @@ $(LIGHTTPD_DIR)/.configured: $(LIGHTTPD_DIR)/.unpacked
$(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY): $(LIGHTTPD_DIR)/.configured
$(MAKE) -C $(LIGHTTPD_DIR) $(MAKE) -C $(LIGHTTPD_DIR)
$(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY): $(LIGHTTPD_DIR)/$(LIGHTTPD_BINARY)
$(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install $(MAKE) DESTDIR=$(TARGET_DIR) -C $(LIGHTTPD_DIR) install
@rm -rf $(TARGET_DIR)/usr/share/man $(TARGET_DIR)/usr/man ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
@rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la @rm -rf $(TARGET_DIR)/usr/lib/lighttpd/*.la
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/lighttpd/*.so
$(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) $(STRIP) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)
@if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ]; then \ @if [ ! -f $(TARGET_DIR)/etc/lighttpd/lighttpd.conf ]; then \
$(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf $(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \ $(INSTALL) -m 0644 -D $(LIGHTTPD_DIR)/doc/lighttpd.conf \
$(TARGET_DIR)/etc/lighttpd/lighttpd.conf; \
fi fi
$(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd $(TARGET_DIR)/etc/init.d/S99lighttpd $(INSTALL) -m 0755 -D package/lighttpd/rc.lighttpd \
$(TARGET_DIR)/etc/init.d/S99lighttpd
ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y) ifeq ($(strip $(BR2_PACKAGE_LIGHTTPD_OPENSSL)),y)
lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY) lighttpd: uclibc openssl $(TARGET_DIR)/$(LIGHTTPD_TARGET_BINARY)

2
package/openntpd/openntpd.mk
View File

@ -64,7 +64,7 @@ ntpd-source: $(DL_DIR)/$(OPENNTPD_SOURCE)
ntpd-clean: ntpd-clean:
rm -f $(addprefix $(TARGET_DIR)/,etc/ntpd.conf \ rm -f $(addprefix $(TARGET_DIR)/,etc/ntpd.conf \
usr/share/man/man?/ntpd.conf* \ usr/share/man/man?/ntpd* \
$(OPENNTPD_TARGET_BINARY)) $(OPENNTPD_TARGET_BINARY))
-$(MAKE) -C $(OPENNTPD_DIR) clean -$(MAKE) -C $(OPENNTPD_DIR) clean

51
package/sed/sed.mk
View File

@ -54,21 +54,29 @@ build-sed-host-binary: $(SED_DIR1)/$(SED_BINARY)
@if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ]; then \ @if [ -L $(HOST_SED_DIR)/$(SED_TARGET_BINARY) ]; then \
rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); \ rm -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY); \
fi fi
@if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \ @if [ ! -f $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
-ot $(SED_DIR1)/$(SED_BINARY) ]; then \ -o $(HOST_SED_DIR)/$(SED_TARGET_BINARY) \
set -x; \ -ot $(SED_DIR1)/$(SED_BINARY) ]; then \
mkdir -p $(HOST_SED_DIR)/bin; \ set -x; \
$(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \ mkdir -p $(HOST_SED_DIR)/bin; \
mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \ $(MAKE) DESTDIR=$(HOST_SED_DIR) -C $(SED_DIR1) install; \
rm -rf $(HOST_SED_DIR)/share/locale $(HOST_SED_DIR)/usr/info \ mv $(HOST_SED_DIR)/usr/bin/sed $(HOST_SED_DIR)/bin/; \
$(HOST_SED_DIR)/usr/man $(HOST_SED_DIR)/usr/share/doc; \ rm -rf $(HOST_SED_DIR)/share/locale; \
rm -rf $(HOST_SED_DIR)/usr/share/doc; \
fi fi
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(HOST_SED_DIR)/usr/man/info
endif
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(HOST_SED_DIR)/usr/share/man
endif
$(HOST_SED_DIR)/$(SED_TARGET_BINARY): $(HOST_SED_DIR)/$(SED_TARGET_BINARY):
if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \ if [ ! -e "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)" ]; then \
mkdir -p "$(HOST_SED_DIR)/bin"; \ mkdir -p "$(HOST_SED_DIR)/bin"; \
rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \ rm -f "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
ln -sf "$(HOST_SED_IF_ANY)" "$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \ ln -sf "$(HOST_SED_IF_ANY)" \
"$(HOST_SED_DIR)/$(SED_TARGET_BINARY)"; \
fi fi
.PHONY: sed host-sed use-sed-host-binary .PHONY: sed host-sed use-sed-host-binary
@ -117,8 +125,8 @@ $(SED_DIR2)/.configured: $(SED_DIR2)/.unpacked
--sysconfdir=/etc \ --sysconfdir=/etc \
--datadir=/usr/share \ --datadir=/usr/share \
--localstatedir=/var \ --localstatedir=/var \
--mandir=/usr/man \ --mandir=/usr/share/man \
--infodir=/usr/info \ --infodir=/usr/share/info \
--include=$(STAGING_DIR)/usr/include \ --include=$(STAGING_DIR)/usr/include \
$(DISABLE_NLS) \ $(DISABLE_NLS) \
) )
@ -133,14 +141,21 @@ sed-target_binary: $(SED_DIR2)/$(SED_BINARY)
rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \ rm -f $(TARGET_DIR)/$(SED_TARGET_BINARY); \
fi fi
@if [ ! -f $(SED_DIR2)/$(SED_BINARY) -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \ @if [ ! -f $(SED_DIR2)/$(SED_BINARY) \
-ot $(SED_DIR2)/$(SED_BINARY) ]; then \ -o $(TARGET_DIR)/$(SED_TARGET_BINARY) \
set -x; \ -ot $(SED_DIR2)/$(SED_BINARY) ]; then \
$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \ set -x; \
mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \ $(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SED_DIR2) install; \
rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ mv $(TARGET_DIR)/usr/bin/sed $(TARGET_DIR)/bin/; \
$(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc; \ rm -rf $(TARGET_DIR)/share/locale; \
rm -rf $(TARGET_DIR)/usr/share/doc; \
fi fi
ifneq ($(BR2_HAVE_INFOPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/info
endif
ifneq ($(BR2_HAVE_MANPAGES),y)
rm -rf $(TARGET_DIR)/usr/share/man
endif
sed: uclibc sed-target_binary sed: uclibc sed-target_binary

36
project/project.mk
View File

@ -1,7 +1,7 @@
PROJECT_FILE:=$(LOCAL)/$(PROJECT)/$(PROJECT).config PROJECT_FILE:=$(LOCAL)/$(PROJECT)/$(PROJECT).config
.PHONY: target-host-info saveconfig getconfig .PHONY: target-host-info saveconfig getconfig
target-host-info: $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname target-host-info: $(TARGET_DIR)/etc/issue $(TARGET_DIR)/etc/hostname
@ -18,27 +18,31 @@ $(TARGET_DIR)/etc/hostname: .config
saveconfig: $(CONFIG)/conf saveconfig: $(CONFIG)/conf
mkdir -p $(LOCAL)/$(PROJECT) mkdir -p $(LOCAL)/$(PROJECT)
-cp .config $(PROJECT_FILE) -cp .config $(PROJECT_FILE)
if [ -f $(LINUX26_DIR)/.config ] ; then \ if [ -f $(LINUX26_DIR)/.config ]; then \
cp $(LINUX26_DIR)/.config $(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config ; \ cp $(LINUX26_DIR)/.config \
$(SED) '/BR2_PACKAGE_LINUX_KCONFIG/d' $(PROJECT_FILE) ; \ $(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config; \
echo "BR2_PACKAGE_LINUX_KCONFIG:=$(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config" >> $(PROJECT_FILE) ; \ $(SED) '/BR2_PACKAGE_LINUX_KCONFIG/d' $(PROJECT_FILE); \
echo "BR2_PACKAGE_LINUX_KCONFIG:=$(LOCAL)/$(PROJECT)/linux-$(LINUX26_VERSION).config" >> $(PROJECT_FILE); \
fi fi
if [ -f $(BUSYBOX_DIR)/.config ] ; then \ if [ -f $(BUSYBOX_DIR)/.config ]; then \
cp $(BUSYBOX_DIR)/.config $(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config ; \ cp $(BUSYBOX_DIR)/.config \
$(SED) '/BR2_PACKAGE_BUSYBOX_CONFIG/d' $(PROJECT_FILE) ; \ $(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config; \
echo "BR2_PACKAGE_BUSYBOX_CONFIG:=$(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config" >> $(PROJECT_FILE) ; \ $(SED) '/BR2_PACKAGE_BUSYBOX_CONFIG/d' $(PROJECT_FILE); \
echo "BR2_PACKAGE_BUSYBOX_CONFIG:=$(LOCAL)/$(PROJECT)/busybox-$(BUSYBOX_VERSION).config" >> $(PROJECT_FILE); \
fi fi
if [ -f $(UCLIBC_DIR)/.config ] ; then \ if [ -f $(UCLIBC_DIR)/.config ]; then \
cp $(UCLIBC_DIR)/.config $(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config ; \ cp $(UCLIBC_DIR)/.config \
$(SED) '/BR2_UCLIBC_CONFIG/d' $(PROJECT_FILE) ; \ $(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config; \
echo "BR2_UCLIBC_CONFIG:=$(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config" >> $(PROJECT_FILE) ; \ $(SED) '/BR2_UCLIBC_CONFIG/d' $(PROJECT_FILE); \
echo "BR2_UCLIBC_CONFIG:=$(LOCAL)/$(PROJECT)/uclibc-$(UCLIBC_VER).config" >> $(PROJECT_FILE); \
fi fi
if [ -f $(UBOOT_DIR)/include/configs/$(PROJECT).h ] ; then \ if [ -f $(UBOOT_DIR)/include/configs/$(PROJECT).h ]; then \
cp $(UBOOT_DIR)/include/configs/$(PROJECT).h $(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h ; \ cp $(UBOOT_DIR)/include/configs/$(PROJECT).h \
$(LOCAL)/$(PROJECT)/u-boot/$(PROJECT).h; \
fi fi
getconfig: $(CONFIG)/conf getconfig: $(CONFIG)/conf
-cp $(LOCAL)/$(PROJECT)/$(PROJECT).config .config -cp $(LOCAL)/$(PROJECT)/$(PROJECT).config .config
vendor-dbg: vendor-dbg:
@echo VENDOR_SITE=$(BR2_VENDOR_SITE) @echo VENDOR_SITE=$(BR2_VENDOR_SITE)

51
toolchain/binutils/Config.in
View File

@ -13,7 +13,7 @@ choice
bool "binutils 2.14.90.0.8" bool "binutils 2.14.90.0.8"
config BR2_BINUTILS_VERSION_2_15 config BR2_BINUTILS_VERSION_2_15
depends !BR2_avr32 && BR2_DEPRECATED depends !BR2_avr32 && BR2_DEPRECATED
bool "binutils 2.15" bool "binutils 2.15"
config BR2_BINUTILS_VERSION_2_15_94_0_2_2 config BR2_BINUTILS_VERSION_2_15_94_0_2_2
@ -107,34 +107,33 @@ endchoice
config BR2_BINUTILS_VERSION config BR2_BINUTILS_VERSION
string string
default "2.14.90.0.8" if BR2_BINUTILS_VERSION_2_14_90_0_8 default "2.14.90.0.8" if BR2_BINUTILS_VERSION_2_14_90_0_8
default "2.15" if BR2_BINUTILS_VERSION_2_15 default "2.15" if BR2_BINUTILS_VERSION_2_15
default "2.15.94.0.2.2" if BR2_BINUTILS_VERSION_2_15_94_0_2_2 default "2.15.94.0.2.2" if BR2_BINUTILS_VERSION_2_15_94_0_2_2
default "2.16.1" if BR2_BINUTILS_VERSION_2_16_1 default "2.16.1" if BR2_BINUTILS_VERSION_2_16_1
default "2.16.90.0.3" if BR2_BINUTILS_VERSION_2_16_90_0_3 default "2.16.90.0.3" if BR2_BINUTILS_VERSION_2_16_90_0_3
default "2.16.91.0.5" if BR2_BINUTILS_VERSION_2_16_91_0_5 default "2.16.91.0.5" if BR2_BINUTILS_VERSION_2_16_91_0_5
default "2.16.91.0.6" if BR2_BINUTILS_VERSION_2_16_91_0_6 default "2.16.91.0.6" if BR2_BINUTILS_VERSION_2_16_91_0_6
default "2.16.91.0.7" if BR2_BINUTILS_VERSION_2_16_91_0_7 default "2.16.91.0.7" if BR2_BINUTILS_VERSION_2_16_91_0_7
default "2.17" if BR2_BINUTILS_VERSION_2_17 default "2.17" if BR2_BINUTILS_VERSION_2_17
default "2.17.50.0.2" if BR2_BINUTILS_VERSION_2_17_50_0_2 default "2.17.50.0.2" if BR2_BINUTILS_VERSION_2_17_50_0_2
default "2.17.50.0.3" if BR2_BINUTILS_VERSION_2_17_50_0_3 default "2.17.50.0.3" if BR2_BINUTILS_VERSION_2_17_50_0_3
default "2.17.50.0.4" if BR2_BINUTILS_VERSION_2_17_50_0_4 default "2.17.50.0.4" if BR2_BINUTILS_VERSION_2_17_50_0_4
default "2.17.50.0.5" if BR2_BINUTILS_VERSION_2_17_50_0_5 default "2.17.50.0.5" if BR2_BINUTILS_VERSION_2_17_50_0_5
default "2.17.50.0.6" if BR2_BINUTILS_VERSION_2_17_50_0_6 default "2.17.50.0.6" if BR2_BINUTILS_VERSION_2_17_50_0_6
default "2.17.50.0.7" if BR2_BINUTILS_VERSION_2_17_50_0_7 default "2.17.50.0.7" if BR2_BINUTILS_VERSION_2_17_50_0_7
default "2.17.50.0.8" if BR2_BINUTILS_VERSION_2_17_50_0_8 default "2.17.50.0.8" if BR2_BINUTILS_VERSION_2_17_50_0_8
default "2.17.50.0.9" if BR2_BINUTILS_VERSION_2_17_50_0_9 default "2.17.50.0.9" if BR2_BINUTILS_VERSION_2_17_50_0_9
default "2.17.50.0.10" if BR2_BINUTILS_VERSION_2_17_50_0_10 default "2.17.50.0.10" if BR2_BINUTILS_VERSION_2_17_50_0_10
default "2.17.50.0.12" if BR2_BINUTILS_VERSION_2_17_50_0_12 default "2.17.50.0.12" if BR2_BINUTILS_VERSION_2_17_50_0_12
default "2.17.50.0.14" if BR2_BINUTILS_VERSION_2_17_50_0_14 default "2.17.50.0.14" if BR2_BINUTILS_VERSION_2_17_50_0_14
default "2.17.50.0.16" if BR2_BINUTILS_VERSION_2_17_50_0_16 default "2.17.50.0.16" if BR2_BINUTILS_VERSION_2_17_50_0_16
default "2.17.50.0.17" if BR2_BINUTILS_VERSION_2_17_50_0_17 default "2.17.50.0.17" if BR2_BINUTILS_VERSION_2_17_50_0_17
default "2.18" if BR2_BINUTILS_VERSION_2_18 default "2.18" if BR2_BINUTILS_VERSION_2_18
default "2.18.50.0.1" if BR2_BINUTILS_VERSION_2_18_50_0_1 default "2.18.50.0.1" if BR2_BINUTILS_VERSION_2_18_50_0_1
config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS config BR2_EXTRA_BINUTILS_CONFIG_OPTIONS
string "Additional binutils options" string "Additional binutils options"
default "" default ""
help help
Any additional binutils options you may want to include. Any additional binutils options you may want to include.