domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvram: remove libnvram.so, it is unused and incompatible to the broadcom API anyway

Browse Source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43698
This commit is contained in:
Felix Fietkau
2014-12-13 23:58:35 +00:00
parent 2b4fbeb6d4
commit 0f51d48c0e
2 changed files with 4 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
package/utils/nvram/Makefile
View File

@@ -42,19 +42,11 @@ define Build/Compile
LDFLAGS="$(TARGET_LDFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
endef endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
ln -s libnvram.so.0.1 $(1)/usr/lib/libnvram.so
endef
define Package/nvram/install define Package/nvram/install
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram $(INSTALL_BIN) ./files/nvram.init $(1)/etc/init.d/nvram
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/nvram $(1)/usr/sbin/
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/libnvram.so.0.1 $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,nvram)) $(eval $(call BuildPackage,nvram))

34
package/utils/nvram/src/Makefile
View File

@@ -1,33 +1,7 @@
CLI_FILENAME = nvram all: nvram
LIB_VERMAJOR = 0 nvram:
LIB_VERMINOR = 1 $(CC) $(CFLAGS) -o $@ cli.c crc.c nvram.c $(LDFLAGS)
LIB_FILENAME = libnvram.so
LIB_CFLAGS = $(CFLAGS) -shared -fPIC
LIB_LDFLAGS = $(LDFLAGS) -Wl,-soname,$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
CLI_CFLAGS = $(CFLAGS)
CLI_LDFLAGS = $(LDFLAGS)
CLI_OBJ = cli.o
LIB_OBJ = crc.o nvram.o
all: cli libnvram
cli: libnvram
$(CC) $(CLI_CFLAGS) -c -o cli.o cli.c
$(CC) -o $(CLI_FILENAME) $(CLI_LDFLAGS) $(CLI_OBJ) \
$(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR)
cli.o: cli.c
$(CC) $(CLI_CFLAGS) -c -o $@ $<
libnvram:
$(CC) $(LIB_CFLAGS) -c -o crc.o crc.c
$(CC) $(LIB_CFLAGS) -c -o nvram.o nvram.c
$(CC) $(LIB_CFLAGS) $(LIB_LDFLAGS) \
-o $(LIB_FILENAME).$(LIB_VERMAJOR).$(LIB_VERMINOR) $(LIB_OBJ)
clean: clean:
rm -f $(CLI_FILENAME) $(LIB_FILENAME)* *.o rm -f nvram