diff options
46 files changed, 52 insertions, 71 deletions
diff --git a/mk/modules.mk b/mk/modules.mk index 7dd4b232a..1a8b5c1cd 100644 --- a/mk/modules.mk +++ b/mk/modules.mk @@ -1062,7 +1062,6 @@ $(eval $(call KMOD_template,SND_CS5535AUDIO,sound-cs5535audio,\ $(eval $(call KMOD_template,VIDEO_DEV,video-dev,\ $(MODULES_DIR)/kernel/drivers/media/video/v4l1-compat \ - $(MODULES_DIR)/kernel/drivers/media/video/v4l2-compat-ioctl32 \ $(MODULES_DIR)/kernel/drivers/media/video/videodev \ ,65)) diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index caaa9552c..b45ecdffc 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -10,7 +10,7 @@ PKG_MD5SUM:= 62e8e47cbd63741b4bbe634dcdc8a56a PKG_DESCR:= MESA library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm -PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP+= libXdamage libXfixes libXxf86vm libdrm PKG_BUILDDEP+= dri2proto glproto expat PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/7.8.1/ diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile index 2a4496913..8cdcc79d3 100644 --- a/package/alsa-utils/Makefile +++ b/package/alsa-utils/Makefile @@ -5,14 +5,14 @@ include ${TOPDIR}/rules.mk PKG_NAME:= alsa-utils PKG_VERSION:= 1.0.22 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d PKG_DESCR:= ALSA mixer utility PKG_SECTION:= utils PKG_DEPENDS:= alsa-lib libpthread PKG_BUILDDEP+= alsa-lib ifeq (${ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER},y) -PKG_BUILDDEP+= libncurses +PKG_BUILDDEP+= ncurses endif PKG_URL:= http://www.alsa-project.org PKG_SITES:= ftp://ftp.task.gda.pl/pub/linux/misc/alsa/utils/ \ diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index b56898d2a..1e08d99b0 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -121,7 +121,7 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - cd "$(WRKBUILD)/menuselect"; ./configure + cd "$(WRKBUILD)/menuselect"; ./configure pre-build: $(MAKE) -C $(WRKBUILD)/menuselect diff --git a/package/busybox/Makefile b/package/busybox/Makefile index fb326feeb..f14b8db53 100644 --- a/package/busybox/Makefile +++ b/package/busybox/Makefile @@ -37,7 +37,7 @@ ${TOPDIR}/.busyboxcfg: ${TOPDIR}/.config ${WRKBUILD}/.config: ${TOPDIR}/.busyboxcfg cp $(TOPDIR)/.busyboxcfg ${WRKBUILD}/.config $(SED) 's;@IDIR@;${WRKINST};' ${WRKBUILD}/.config - + do-configure: ${WRKBUILD}/.config ifeq ($(ADK_NATIVE),y) yes '' | \ diff --git a/package/davfs2/Makefile b/package/davfs2/Makefile index 11e93d2ce..c4db42838 100644 --- a/package/davfs2/Makefile +++ b/package/davfs2/Makefile @@ -13,7 +13,7 @@ PKG_BUILDDEP+= libiconv neon ifneq (${ADK_PACKAGE_DAVFS2_FUSE}${ADK_PACKAGE_DAVFS2_BOTH},) PKG_BUILDDEP+= fuse endif -PKG_URL:= http://savannah.nongnu.org/projects/davfs2 +PKG_URL:= http://savannah.nongnu.org/projects/davfs2 PKG_SITES:= http://www.very-clever.com/download/nongnu/davfs2/ ifeq (${ADK_PACKAGE_DAVFS2_FUSE},y) diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile index 7069f2ba1..5589b62cc 100644 --- a/package/dhcp-forwarder/Makefile +++ b/package/dhcp-forwarder/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= DHCP relay agent PKG_SECTION:= net PKG_URL:= http://www.nongnu.org/dhcp-fwd PKG_SITES:= http://savannah.nongnu.org/download/dhcp-fwd/ \ - http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/ + http://ftp.cc.uoc.gr/mirrors/nongnu.org/dhcp-fwd/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index e6f473380..48e39f5ae 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= dropbear PKG_VERSION:= 0.52 PKG_RELEASE:= 3 PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e -PKG_DESCR:= SSH 2 server/client designed for embedded systems +PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net PKG_URL:= http://matt.ucc.asn.au/dropbear PKG_SITES:= http://matt.ucc.asn.au/dropbear/releases/ diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile index 5c3c76899..7b09ea1e3 100644 --- a/package/eglibc/Makefile +++ b/package/eglibc/Makefile @@ -46,7 +46,7 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \ libc_cv_forced_unwind=yes \ libc_cv_c_cleanup=yes \ libc_cv_gnu99_inline=yes \ - libc_cv_slibdir="/lib" + libc_cv_slibdir="/lib" # compile nothing, eglibc is already build in toolchain directory do-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 32ce9fd59..a524b79bf 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -8,7 +8,7 @@ PKG_DESCR:= GNU debugger (small server) PKG_SECTION:= comp PKG_DEPENDS:= libthread-db -PKG_TARGET_DEPENDS:= !foxboard +PKG_TARGET_DEPENDS:= !foxboard include ${TOPDIR}/mk/package.mk diff --git a/package/grub/Makefile b/package/grub/Makefile index 98abae051..b594a5632 100644 --- a/package/grub/Makefile +++ b/package/grub/Makefile @@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --disable-efiemu \ --disable-grub-fstest post-install: - ${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin} + ${INSTALL_DIR} $(IDIR_GRUB)/usr/{sbin,lib,bin} ${INSTALL_DIR} $(IDIR_GRUB)/etc ${CP} ${WRKINST}/etc/grub.d $(IDIR_GRUB)/etc ${CP} ${WRKINST}/usr/lib/* $(IDIR_GRUB)/usr/lib diff --git a/package/gtk+/Makefile b/package/gtk+/Makefile index 32edbc34d..c67a7c101 100644 --- a/package/gtk+/Makefile +++ b/package/gtk+/Makefile @@ -23,7 +23,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GTK,libgtk+,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) CONFIGURE_ENV+= gio_can_sniff=no \ - ac_cv_path_GTK_UPDATE_ICON_CACHE="" + ac_cv_path_GTK_UPDATE_ICON_CACHE="" CONFIGURE_ARGS+= --without-libtiff \ --without-libjpeg diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 1696dcabb..10d1928bf 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,10 +9,10 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 697ed89f37af4473a5f6349ba2700f2d PKG_DESCR:= The netfilter firewalling software PKG_SECTION:= net -PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack -PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat +PKG_DEPENDS:= kmod-ip-nf-iptables kmod-nf-conntrack +PKG_DEPENDS+= kmod-nf-conntrack-ipv4 kmod-nf-nat PKG_DEPENDS+= kmod-ip-nf-target-masquerade kmod-ip-nf-target-reject -PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state +PKG_DEPENDS+= kmod-ip-nf-filter kmod-ip-nf-match-state PKG_DEPENDS+= kmod-netfilter-xt-target-tcpmss PKG_DEPENDS6:= kmod-ip6-nf-iptables kmod-nf-conntrack-ipv6 PKG_DEPENDS6+= kmod-ip6-nf-filter kmod-ip6-nf-target-reject diff --git a/package/libao/Makefile b/package/libao/Makefile index 6592afeec..02c411a0e 100644 --- a/package/libao/Makefile +++ b/package/libao/Makefile @@ -28,5 +28,5 @@ post-install: ${CP} ${WRKINST}/usr/lib/libao.so* ${IDIR_LIBAO}/usr/lib/ ${CP} ${WRKINST}/usr/lib/ao/plugins-2/*.so \ ${IDIR_LIBAO}/usr/lib/ao/plugins-2 - + include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libgd/Makefile b/package/libgd/Makefile index f36930a5d..7b9d7c046 100644 --- a/package/libgd/Makefile +++ b/package/libgd/Makefile @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --without-x \ --without-freetype \ --with-jpeg=${STAGING_DIR}/usr \ --with-png=${STAGING_DIR}/usr \ - --without-xpm + --without-xpm post-install: ${INSTALL_DIR} ${IDIR_LIBGD}/usr/lib diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index 645e6868c..180a93715 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -29,7 +29,7 @@ do-install: ${INSTALL_DIR} ${IDIR_LIBSTDCXX}/lib ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib -else +else $(CP) ${STAGING_DIR}/lib/libstdc++.so.* ${IDIR_LIBSTDCXX}/lib endif diff --git a/package/mpd/Makefile b/package/mpd/Makefile index c173c6b56..114102998 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -119,9 +119,9 @@ CONFIGURE_ARGS+= --disable-aac endif ifneq (${ADK_PACKAGE_MPD_WITH_OGG},) -CONFIGURE_ARGS+= --enable-vorbis +CONFIGURE_ARGS+= --enable-vorbis else -CONFIGURE_ARGS+= --disable-vorbis +CONFIGURE_ARGS+= --disable-vorbis endif ifneq (${ADK_PACKAGE_MPD_WITH_TREMOR},) diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index d05da35f5..a83e0d4ab 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= popular video player PKG_SECTION:= video PKG_DEPENDS:= alsa-lib libjpeg libfaad2 libmad libncurses PKG_DEPENDS+= libogg libpng libpthread libvorbis -PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib +PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib PKG_BUILDDEP+= alsa-lib libmad libvorbis faad2 ncurses zlib PKG_BUILDDEP+= libX11 libXv libpng libXext ifeq (${ADK_PACKAGE_MPLAYER_WITH_DIRECTFB},y) diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index d495ff10d..db10ad609 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -26,7 +26,7 @@ TCXXFLAGS+= -fno-builtin -nostdinc++ -nodefaultlibs \ -I${STAGING_DIR}/usr/include/uClibc++ TLDFLAGS+= -nodefaultlibs -luClibc++ -shared endif -XAKE_FLAGS+= EXTRA_FLAGS="${TCFLAGS}" +XAKE_FLAGS+= EXTRA_FLAGS="${TCFLAGS}" post-install: ${INSTALL_DIR} ${IDIR_MRD6}/usr/sbin ${IDIR_MRD6}/etc diff --git a/package/netperf/Makefile b/package/netperf/Makefile index c5966bb45..a4fa41a90 100644 --- a/package/netperf/Makefile +++ b/package/netperf/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 391a0d98954c72a6ad7f08b8a115e1ce PKG_DESCR:= Program and service to do network performance measurement. PKG_SECTION:= net -PKG_URL:= http://www.netperf.org/netperf/ +PKG_URL:= http://www.netperf.org/netperf/ PKG_SITES:= ftp://ftp.netperf.org/netperf/archive/ \ ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/ diff --git a/package/nut/Makefile b/package/nut/Makefile index aae2f2b49..46a1063da 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -91,7 +91,7 @@ CONFIGURE_ENV+= CPPFLAGS="${TCPPFLAGS} ${TLDFLAGS}" MAKE_FLAGS+= SSL_CFLAGS="${TCPPFLAGS}" SSL_LDFLAGS="${TLDFLAGS} -lssl -lcrypto" endif -ALL_TARGET:= all +ALL_TARGET:= all INSTALL_TARGET:= install ifneq (${ADK_PACKAGE_NUT_USB},) @@ -108,7 +108,7 @@ post-install: ${INSTALL_DIR} ${IDIR_NUT}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/sbin/ups{d,mon,sched} \ ${IDIR_NUT}/usr/sbin/ - ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_NUT}/usr/lib + ${CP} ${WRKINST}/usr/lib/lib*.so* ${IDIR_NUT}/usr/lib ${INSTALL_BIN} ${WRKINST}/usr/bin/{${INSTALL_DRIVERS}} \ ${IDIR_NUT}/usr/bin/ ${INSTALL_BIN} ${WRKINST}/usr/bin/ups{c,cmd,drvctl,log,rw} \ diff --git a/package/obexftp/Makefile b/package/obexftp/Makefile index cebeee004..67399ba12 100644 --- a/package/obexftp/Makefile +++ b/package/obexftp/Makefile @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --disable-perl \ --disable-python post-install: - ${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin + ${INSTALL_DIR} ${IDIR_OBEXFTP}/usr/bin ${CP} ${WRKINST}/usr/bin/obexftp{,d} ${IDIR_OBEXFTP}/usr/bin/ ifneq ($(ADK_STATIC),y) ${INSTALL_DIR} ${IDIR_LIBOBEXFTP}/usr/lib diff --git a/package/openswan/Makefile b/package/openswan/Makefile index 13110a76d..6c8a62c98 100644 --- a/package/openswan/Makefile +++ b/package/openswan/Makefile @@ -43,7 +43,7 @@ ALL_TARGET:= programs post-install: ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/lib/ipsec ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/libexec/ipsec - ${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d + ${INSTALL_DIR} ${IDIR_OPENSWAN}/etc/ipsec.d ${INSTALL_DIR} ${IDIR_OPENSWAN}/usr/sbin ${INSTALL_DATA} ${WRKINST}/etc/ipsec.conf ${IDIR_OPENSWAN}/etc/ ${CP} ${WRKINST}/etc/ipsec.d/* ${IDIR_OPENSWAN}/etc/ipsec.d diff --git a/package/pkgmaker b/package/pkgmaker index cd40ccb94..0e8e21372 100644 --- a/package/pkgmaker +++ b/package/pkgmaker @@ -11,6 +11,9 @@ GMAKE="$GMAKE --no-print-directory" (( x_cols = (COLUMNS > 10) ? COLUMNS - 2 : 80 )) typeset -L$x_cols pbar +# check for trailing whitespace +grep -H "[[:space:]]$" */Makefile && print "Found trailing whitespace, please fix" + # build a cache of “ipkg package name” → “package conf option” for # use with dependency resolution rm -rf pkglist.d diff --git a/package/rtsp/src/Makefile b/package/rtsp/src/Makefile index d7be5bab8..55589a537 100644 --- a/package/rtsp/src/Makefile +++ b/package/rtsp/src/Makefile @@ -9,7 +9,7 @@ else # Normal Makefile -all: +all: $(MAKE) -C $(KERNELDIR) M=`pwd` modules debug: diff --git a/package/sane-backends/Makefile b/package/sane-backends/Makefile index 4433e34ad..218a097c7 100644 --- a/package/sane-backends/Makefile +++ b/package/sane-backends/Makefile @@ -159,7 +159,7 @@ CONFIGURE_ARGS+= --disable-translations \ --enable-libusb post-install: ${INSTALL_MODS_y} ${INSTALL_MODS_m} - ${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/etc/sane.d + ${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/etc/sane.d ${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/usr/lib ${INSTALL_DIR} ${IDIR_SANE_BACKENDS}/usr/sbin ${CP} ${WRKINST}/etc/sane.d/dll.conf ${IDIR_SANE_BACKENDS}/etc/sane.d diff --git a/package/shorewall-common/Makefile b/package/shorewall-common/Makefile index 5e311d358..7d6c48bf4 100644 --- a/package/shorewall-common/Makefile +++ b/package/shorewall-common/Makefile @@ -29,7 +29,7 @@ do-build: ${RM} -R ${WRKINST}/usr/share/shorewall/configfiles ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPCONF),y) - ${BASH} ./files/downstrip ${WRKINST}/etc/shorewall + ${BASH} ./files/downstrip ${WRKINST}/etc/shorewall endif ifeq ($(ADK_PACKAGE_SHOREWALL_STRIPSHARED),y) diff --git a/package/subversion/Makefile b/package/subversion/Makefile index 4cb14937f..32003a993 100644 --- a/package/subversion/Makefile +++ b/package/subversion/Makefile @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --without-jikes CONFIGURE_ARGS+= --without-jdk CONFIGURE_ARGS+= --disable-javahl CONFIGURE_ARGS+= --without-berkeley-db -LIBS= -lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv +LIBS= -lsqlite3 -laprutil-1 -lapr-1 -lexpat -liconv ifeq ($(ADK_PACKAGE_SUBVERSION_NEON),y) CONFIGURE_ARGS+= -disable-neon-version-check diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 616108c50..c7ed0759b 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= vgp PKG_VERSION:= 0.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7 -PKG_DESCR:= vgp is a daemon working like Cisco HSRP +PKG_DESCR:= vgp is a daemon working like Cisco HSRP PKG_SECTION:= net PKG_URL:= http://vgpd.freaknet.org PKG_SITES:= http://vgpd.freaknet.org/files/ diff --git a/package/xf86-input-keyboard/Makefile b/package/xf86-input-keyboard/Makefile index be80953ef..f09e4edde 100644 --- a/package/xf86-input-keyboard/Makefile +++ b/package/xf86-input-keyboard/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-input-keyboard PKG_VERSION:= 1.4.0 PKG_RELEASE:= 1 PKG_MD5SUM:= fc836be5364d80604cb11f4daacceb23 -PKG_DESCR:= X11 driver for keyboard +PKG_DESCR:= X11 driver for keyboard PKG_SECTION:= x11 PKG_BUILDDEP+= xorg-server PKG_DEPENDS:= xorg-server diff --git a/package/xf86-input-mouse/Makefile b/package/xf86-input-mouse/Makefile index 623364ba6..1313c46b1 100644 --- a/package/xf86-input-mouse/Makefile +++ b/package/xf86-input-mouse/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xf86-input-mouse PKG_VERSION:= 1.5.0 PKG_RELEASE:= 1 PKG_MD5SUM:= a662883fd9709c3dad7fb113ad8d2908 -PKG_DESCR:= X11 driver for mouse +PKG_DESCR:= X11 driver for mouse PKG_SECTION:= x11 PKG_DEPENDS:= xorg-server PKG_BUILDDEP+= xorg-server diff --git a/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index 30da515e0..3a305cb9e 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -24,7 +24,7 @@ INSTALL_STYLE:= manual CONFIGURE_ARGS+= --enable-gettext=no \ --with-gnu-ld CONFIGURE_ENV+= DEBUG=" " OPTIMIZER=" " -ALL_TARGET= +ALL_TARGET= do-install: ${INSTALL_DIR} ${IDIR_XFSPROGS}/usr/sbin diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index 7f5f258f4..702f8b4e5 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -20,7 +20,7 @@ post-install: ${INSTALL_DIR} ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb ${CP} ${WRKINST}/usr/share/X11/xkb/* \ ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb - rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst + rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.lst rm ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/rules/*.xml rm -rf ${IDIR_XKEYBOARD_CONFIG}/usr/share/X11/xkb/symbols/sun_vndr diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile index 12ee831e1..6659e04db 100644 --- a/package/xorg-server/Makefile +++ b/package/xorg-server/Makefile @@ -78,7 +78,7 @@ post-install: $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions - $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts + $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia ${CP} ${WRKINST}/usr/lib/xorg/protocol.txt \ $(IDIR_XORG_SERVER)/usr/lib/xorg/ diff --git a/target/Makefile b/target/Makefile index dc77bf75f..5e7259d8a 100644 --- a/target/Makefile +++ b/target/Makefile @@ -10,7 +10,7 @@ all: install # The following target combines all kernel-related variables and # config files into a single one to be used as the final kernel # configuration when building. This is how it's done: -# 1) fetch all ADK_KPACKAGE_KMOD_* vars into +# 1) fetch all ADK_KPACKAGE_KMOD_* vars into # .kernelconfig.modules and set them to "m" # 2) fetch all enabled ADK_KERNEL_* vars into # .kernelconfig.kernel (no conversion, as they are booleans) diff --git a/target/alix2d/kernel.config b/target/alix2d/kernel.config index 13b187f2a..9169d8037 100644 --- a/target/alix2d/kernel.config +++ b/target/alix2d/kernel.config @@ -1177,16 +1177,10 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_TEST is not set @@ -1268,10 +1262,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_PADLOCK is not set -CONFIG_CRYPTO_DEV_GEODE=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_HW is not set # # OCF Configuration diff --git a/target/alix2d13/kernel.config b/target/alix2d13/kernel.config index fa700691b..f46102881 100644 --- a/target/alix2d13/kernel.config +++ b/target/alix2d13/kernel.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34 -# Sat Jun 26 22:13:41 2010 +# Mon Jul 5 20:11:20 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1171,16 +1171,10 @@ CONFIG_CRYPTO=y # # Crypto core or helper # -CONFIG_CRYPTO_ALGAPI=y -CONFIG_CRYPTO_ALGAPI2=y -CONFIG_CRYPTO_BLKCIPHER=y -CONFIG_CRYPTO_BLKCIPHER2=y -CONFIG_CRYPTO_RNG2=y # CONFIG_CRYPTO_MANAGER is not set # CONFIG_CRYPTO_MANAGER2 is not set # CONFIG_CRYPTO_GF128MUL is not set # CONFIG_CRYPTO_NULL is not set -CONFIG_CRYPTO_WORKQUEUE=y # CONFIG_CRYPTO_CRYPTD is not set # CONFIG_CRYPTO_AUTHENC is not set # CONFIG_CRYPTO_TEST is not set @@ -1262,10 +1256,7 @@ CONFIG_CRYPTO_WORKQUEUE=y # Random Number Generation # # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_DEV_PADLOCK is not set -CONFIG_CRYPTO_DEV_GEODE=y -# CONFIG_CRYPTO_DEV_HIFN_795X is not set +# CONFIG_CRYPTO_HW is not set # # OCF Configuration diff --git a/target/foxg20/Makefile b/target/foxg20/Makefile index 8c97fc4ad..0a022baf3 100644 --- a/target/foxg20/Makefile +++ b/target/foxg20/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/mk/image.mk KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel LOADADDR:= 0x20008000 -kernel-install: +kernel-install: @gzip -9 < $(LINUX_DIR)/arch/arm/boot/Image > ${BUILD_DIR}/Image.gz @mkimage -A arm -O linux -T kernel -C gzip \ -a ${LOADADDR} -e ${LOADADDR} -d ${BUILD_DIR}/Image.gz \ diff --git a/target/ibmx40/Makefile b/target/ibmx40/Makefile index f3ef6575a..3c95fc2d1 100644 --- a/target/ibmx40/Makefile +++ b/target/ibmx40/Makefile @@ -14,7 +14,7 @@ createinitcrypt: echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @@ -55,7 +55,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'mount /dev/sda1 /mnt/boot' @echo 'mount /dev/mapper/crypt /mnt/root' @echo 'mkdir /mnt/boot/boot' - @echo @echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it' @echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)' @echo 'cd /mnt/root ; mknod -m 644 console c 5 1' diff --git a/target/lemote/Makefile b/target/lemote/Makefile index 40b19b19c..09cfb8b5c 100644 --- a/target/lemote/Makefile +++ b/target/lemote/Makefile @@ -14,7 +14,7 @@ createinitcrypt: echo 'CONFIG_INITRAMFS_ROOT_UID=0' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=0' >> $(LINUX_DIR)/.config echo N |$(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ - CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) + CC="$(TARGET_CC)" oldconfig $(MAKE_TRACE) $(MAKE) -C $(LINUX_DIR) V=1 CROSS_COMPILE="$(TARGET_CROSS)" ARCH=$(ARCH) \ CC="$(TARGET_CC)" $(MAKE_TRACE) @cp $(KERNEL) $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel @@ -66,7 +66,6 @@ imageinstall: $(BIN_DIR)/$(ROOTFSUSERTARBALL) createinitcrypt @echo 'mount /dev/sda1 /mnt/boot' @echo 'mount /dev/mapper/crypt /mnt/root' @echo 'mkdir /mnt/boot/boot' - @echo @echo 'Copy $(ROOTFSUSERTARBALL) via scp to /mnt/root and extract it' @echo 'cd /mnt/root ; gunzip $(ROOTFSUSERTARBALL); tar xpvf $(ROOTFSUSERTARBALL)' @echo 'Copy ${ADK_TARGET}-${FS}-kernel via scp to /mnt/boot/boot' diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto index 826e47570..cb6675468 100644 --- a/target/linux/config/Config.in.crypto +++ b/target/linux/config/Config.in.crypto @@ -47,7 +47,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_DEV_GEODE tristate select ADK_KERNEL_CRYPTO_HW select ADK_KERNEL_CRYPTO - depends on ADK_LINUX_X86_ALIX1C + depends on ADK_LINUX_ALIX help Say 'Y' here to use the AMD Geode LX processor on-board AES engine for the CryptoAPI AES algorithm. diff --git a/target/linux/config/Config.in.multimedia b/target/linux/config/Config.in.multimedia index 87dc93aa0..a67af9a89 100644 --- a/target/linux/config/Config.in.multimedia +++ b/target/linux/config/Config.in.multimedia @@ -135,5 +135,4 @@ config ADK_KPACKAGE_KMOD_USB_PWC default n help -#source package/em28xx/Config.in endmenu diff --git a/target/rb4xx/Makefile b/target/rb4xx/Makefile index 5bc9aba7e..b4e98a5a8 100644 --- a/target/rb4xx/Makefile +++ b/target/rb4xx/Makefile @@ -11,7 +11,7 @@ OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(TARGET_DIR)/boot/kernel + $(TARGET_DIR)/boot/kernel @cp $(TARGET_DIR)/boot/kernel \ $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel diff --git a/target/rb532/Makefile b/target/rb532/Makefile index 223099c9c..5cefd22d3 100644 --- a/target/rb532/Makefile +++ b/target/rb532/Makefile @@ -12,7 +12,7 @@ KERNEL:=$(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel kernel-install: $(TARGET_CROSS)objcopy $(OSTRIP) -S $(LINUX_DIR)/vmlinux \ - $(TARGET_DIR)/boot/kernel + $(TARGET_DIR)/boot/kernel @cp $(TARGET_DIR)/boot/kernel \ $(BUILD_DIR)/${ADK_TARGET}-${FS}-kernel diff --git a/target/wag54g/Makefile b/target/wag54g/Makefile index 78f88111c..0a864ad4c 100644 --- a/target/wag54g/Makefile +++ b/target/wag54g/Makefile @@ -25,7 +25,7 @@ kernel-install: tools-compile $(LINUX_DIR)/vmlinux.tmp PATH='${TARGET_PATH}' \ addpattern -p WA21 -i $(LINUX_DIR)/vmlinux.tmp \ - -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel + -o $(BIN_DIR)/${ADK_TARGET}-${FS}-kernel ifeq ($(FS),squashfs) imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSSQUASHFS) diff --git a/toolchain/glibc-ports/Makefile b/toolchain/glibc-ports/Makefile index be4a39e65..6cfc0c810 100644 --- a/toolchain/glibc-ports/Makefile +++ b/toolchain/glibc-ports/Makefile @@ -7,7 +7,7 @@ include Makefile.inc include ${TOPDIR}/mk/buildhlp.mk -$(WRKBUILD)/.headers: +$(WRKBUILD)/.headers: touch $@ $(WRKBUILD)/.configured: |