Changeset 22978


Ignore:
Timestamp:
2010-09-08T02:36:35+02:00 (6 years ago)
Author:
jow
Message:

[imagebuilder]

  • add a helper script to generate opkg.conf, attempt to detect package architecture from packages/
  • fix package defaults when no package override is given, IB previously aggregated the defautls of all profiles
  • introduce a repositories.conf, allows using remote opkg repositories in imagebuilder
Location:
trunk/target/imagebuilder
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/imagebuilder/Makefile

    r21213 r22978  
    2323$(BIN_DIR)/$(IB_NAME).tar.bz2: clean 
    2424        rm -rf $(PKG_BUILD_DIR) 
    25         mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target 
     25        mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host \ 
     26                $(PKG_BUILD_DIR)/target $(PKG_BUILD_DIR)/scripts 
    2627        -cp $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config 
    2728        $(CP) \ 
     
    2930                $(TOPDIR)/rules.mk \ 
    3031                ./files/Makefile \ 
     32                ./files/repositories.conf \ 
    3133                $(TMP_DIR)/.targetinfo \ 
    3234                $(TMP_DIR)/.packageinfo \ 
    3335                $(PKG_BUILD_DIR)/ 
     36        $(CP) ./files/opkg-generate-config.sh $(PKG_BUILD_DIR)/scripts/ 
    3437        $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages 
    3538        $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/ 
  • trunk/target/imagebuilder/files/Makefile

    r22973 r22978  
    8787        @mkdir -p $(TOPDIR)/tmp 
    8888        @mkdir -p $(TARGET_DIR)/tmp 
    89         @echo 'dest root /' > $@ 
    90         @echo 'src packages file:$(PACKAGE_DIR)' >> $@ 
    91         @echo 'arch all 100' >> $@ 
    92 ifneq ($(CONFIG_TARGET_adm5120),y) 
    93         @echo 'arch $(BOARD) 200' >> $@ 
    94 else 
    95         @echo 'arch $(BOARD)_$(ARCH) 200' >> $@ 
    96 endif 
    97         @echo 'option offline_root $(TARGET_DIR)' >> $@ 
     89        @$(TOPDIR)/scripts/opkg-generate-config.sh $(TARGET_DIR) 
    9890 
    9991BUILD_PACKAGES:=$(sort $(DEFAULT_PACKAGES) $(USER_PACKAGES) $($(USER_PROFILE)_PACKAGES) kernel) 
    10092# "-pkgname" in the package list means remove "pkgname" from the package list 
    10193BUILD_PACKAGES:=$(filter-out $(filter -%,$(BUILD_PACKAGES)) $(patsubst -%,%,$(filter -%,$(BUILD_PACKAGES))),$(BUILD_PACKAGES)) 
     94PACKAGES:= 
    10295 
    10396_call_image: 
Note: See TracChangeset for help on using the changeset viewer.