Index: app/kmod/33/Makefile
===================================================================
--- app/kmod/33/Makefile (revision 420)
+++ app/kmod/33/Makefile (revision 421)
@@ -96,7 +96,7 @@
### |---handy-ruler-------------------------------|
KMOD_PKG_SHORT_DESCRIPTION = kernel module tools and library
KMOD_PKG_URL = $(BUG_URL)
-KMOD_PKG_LICENSE = GPLv2
+KMOD_PKG_LICENSE = LGPLv2.1
KMOD_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(KMOD_PKG_NAME)-pkg-description
KMOD_PKG_DESCRIPTION_FILE_IN = $(KMOD_PKG_NAME)-pkg-description.in
KMOD_PKG_INSTALL_SCRIPT = $(KMOD_PKG_NAME)-pkg-install.sh
@@ -163,7 +163,6 @@
$(install_target): $(build_target)
@mkdir -p $(KMOD_PKG)
@cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
- exit 1
@( cd $(KMOD_PKG)/sbin ; \
for file in depmod insmod lsmod modinfo modprobe rmmod ; do \
ln -sf kmod $$file ; \
@@ -177,7 +176,7 @@
@mv $(KMOD_PKG)/lib$(LIBSUFFIX)/{*.so,*.la} $(KMOD_PKG)/usr/lib$(LIBSUFFIX)
@cp -a $(KMOD_PKG)/lib$(LIBSUFFIX)/libkmod.so.2 $(KMOD_PKG)/usr/lib$(LIBSUFFIX)
@( cd $(KMOD_PKG)/usr/lib$(LIBSUFFIX) ; \
- ln -sf ../../lib$(LIBSUFFIX)/libkmod.so.2.4.0 libkmod.so.2.4.0 ; \
+ ln -sf ../../lib$(LIBSUFFIX)/libkmod.so.2.5.0 libkmod.so.2.5.0 ; \
sed -i "s,libdir='/lib',libdir='/usr/lib',g" libkmod.la ; \
sed -i "s,libdir=/lib,libdir=/usr/lib,g" pkgconfig/libkmod.pc ; \
)
@@ -199,11 +198,13 @@
) \
fi
@mkdir -p $(KMOD_PKG)/usr/doc/$(src_dir_name)
- @cp -a $(SRC_DIR)/COPYING* \
+ @cp -a $(SRC_DIR)/COPYING \
$(KMOD_PKG)/usr/doc/$(src_dir_name)
- @mkdir -p $(KMOD_PKG)/usr/share/doc/$(src_dir_name)
- @cp -a $(SRC_DIR)/COPYING* $(SRC_DIR)/NEWS $(SRC_DIR)/README* $(SRC_DIR)/TODO \
+ @mkdir -p $(KMOD_PKG)/usr/share/doc/$(src_dir_name)/libkmod
+ @cp -a $(SRC_DIR)/COPYING $(SRC_DIR)/NEWS $(SRC_DIR)/README* \
$(KMOD_PKG)/usr/share/doc/$(src_dir_name)
+ @cp -a $(SRC_DIR)/libkmod/README \
+ $(KMOD_PKG)/usr/share/doc/$(src_dir_name)/libkmod
@( cd $(SRC_DIR) ; \
if [ -r ChangeLog ]; then \
DOCSDIR=`echo $(KMOD_PKG)/usr/share/doc/$(src_dir_name)` ; \
@@ -211,24 +212,22 @@
touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
fi \
)
- # ======= remove toolchain path from target libtool *.la files =======
+ # ======= Remove toolchain path from target libtool *.la files =======
@( cd $(KMOD_PKG)/usr/lib$(LIBSUFFIX) ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.la ; \
- sed -i "s,-L/usr/local/lib ,,g" libkmod.la ; \
)
- # ======= remove toolchain path from target pkg-config *.pc files =======
+ # ======= Remove toolchain path from target pkg-config *.pc files =======
@( cd $(KMOD_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
- sed -i "s,-L/usr/local/lib,-L/usr/lib,g" libkmod.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(KMOD_PKG))
- # ======= tune libtool *.la search path to the target destination for development =======
+ # ======= Tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkmod.la ; \
sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libkmod.la \
)
- # ======= tune pkg-config *.pc search path to the target destination for development =======
+ # ======= Tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkmod.pc ; \
)
Index: app/kmod/33-ppc32/Makefile
===================================================================
--- app/kmod/33-ppc32/Makefile (revision 420)
+++ app/kmod/33-ppc32/Makefile (revision 421)
@@ -52,7 +52,7 @@
### |---handy-ruler-------------------------------|
KMOD_32_PKG_SHORT_DESCRIPTION = kernel module library
KMOD_32_PKG_URL = $(BUG_URL)
-KMOD_32_PKG_LICENSE = GPLv2
+KMOD_32_PKG_LICENSE = LGPLv2.1
KMOD_32_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(KMOD_32_PKG_NAME)-pkg-description
KMOD_32_PKG_DESCRIPTION_FILE_IN = $(KMOD_32_PKG_NAME)-pkg-description.in
KMOD_32_PKG_INSTALL_SCRIPT = $(KMOD_32_PKG_NAME)-pkg-install.sh
@@ -127,33 +127,26 @@
@mv $(KMOD_32_PKG)/lib$(MULTILIB_PPC32_SUFFIX)/{*.so,*.la} $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)
@cp -a $(KMOD_32_PKG)/lib$(MULTILIB_PPC32_SUFFIX)/libkmod.so.2 $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
- ln -sf ../../lib$(MULTILIB_PPC32_SUFFIX)/libkmod.so.2.4.0 libkmod.so.2.4.0 ; \
+ ln -sf ../../lib$(MULTILIB_PPC32_SUFFIX)/libkmod.so.2.5.0 libkmod.so.2.5.0 ; \
sed -i "s,libdir='/lib,libdir='/usr/lib,g" libkmod.la ; \
sed -i "s,libdir=/lib,libdir=/usr/lib,g" pkgconfig/libkmod.pc ; \
)
- # ======= remove toolchain path from target libtool *.la files =======
+ # ======= Remove toolchain path from target libtool *.la files =======
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.la ; \
- sed -i "s,-L/usr/local/lib ,,g" libkmod.la ; \
)
- # ======= remove -L/lib, -L/usr/lib options from target libtool *.la files =======
- @( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
- sed -i "s,-L/usr/lib ,,g" libkmod.la ; \
- sed -i "s,-L/lib ,,g" libkmod.la ; \
- )
- # ======= remove toolchain path from target pkg-config *.pc files =======
+ # ======= Remove toolchain path from target pkg-config *.pc files =======
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
- sed -i "s,-L/usr/local/lib,-L/usr/lib$(MULTILIB_PPC32_SUFFIX),g" libkmod.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(KMOD_32_PKG))
- # ======= tune libtool *.la search path to the target destination for development =======
+ # ======= Tune libtool *.la search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX) ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkmod.la ; \
sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libkmod.la ; \
)
- # ======= tune pkg-config *.pc search path to the target destination for development =======
+ # ======= Tune pkg-config *.pc search path to the target destination for development =======
@( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/pkgconfig ; \
sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libkmod.pc ; \
)
Index: app/kmod/33-x86_32/Makefile
===================================================================
--- app/kmod/33-x86_32/Makefile (revision 420)
+++ app/kmod/33-x86_32/Makefile (revision 421)
@@ -49,7 +49,7 @@
### |---handy-ruler-------------------------------|
KMOD_32_PKG_SHORT_DESCRIPTION = kernel module library
KMOD_32_PKG_URL = $(BUG_URL)
-KMOD_32_PKG_LICENSE = GPLv2
+KMOD_32_PKG_LICENSE = LGPLv2.1
KMOD_32_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(KMOD_32_PKG_NAME)-pkg-description
KMOD_32_PKG_DESCRIPTION_FILE_IN = $(KMOD_32_PKG_NAME)-pkg-description.in
KMOD_32_PKG_INSTALL_SCRIPT = $(KMOD_32_PKG_NAME)-pkg-install.sh
@@ -124,24 +124,17 @@
@mv $(KMOD_32_PKG)/lib$(MULTILIB_X86_32_SUFFIX)/{*.so,*.la} $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)
@cp -a $(KMOD_32_PKG)/lib$(MULTILIB_X86_32_SUFFIX)/libkmod.so.2 $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
- ln -sf ../../lib$(MULTILIB_X86_32_SUFFIX)/libkmod.so.2.4.0 libkmod.so.2.4.0 ; \
+ ln -sf ../../lib$(MULTILIB_X86_32_SUFFIX)/libkmod.so.2.5.0 libkmod.so.2.5.0 ; \
sed -i "s,libdir='/lib,libdir='/usr/lib,g" libkmod.la ; \
sed -i "s,libdir=/lib,libdir=/usr/lib,g" pkgconfig/libkmod.pc ; \
)
- # remove toolchain path from target libtool *.la files
+ # ======= Remove toolchain path from target libtool *.la files =======
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.la ; \
- sed -i "s,-L/usr/local/lib ,,g" libkmod.la ; \
)
- # ======= remove -L/lib, -L/usr/lib options from target libtool *.la files =======
- @( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
- sed -i "s,-L/usr/lib ,,g" libkmod.la ; \
- sed -i "s,-L/lib ,,g" libkmod.la ; \
- )
- # ======= remove toolchain path from target pkg-config *.pc files =======
+ # ======= Remove toolchain path from target pkg-config *.pc files =======
@( cd $(KMOD_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
- sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
- sed -i "s,-L/usr/local/lib,-L/usr/lib$(MULTILIB_X86_32_SUFFIX),g" libkmod.pc ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libkmod.pc ; \
)
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(KMOD_32_PKG))